Merge pull request #70 from mpeuster/master