Merge pull request #76 from mpeuster/master