Merge pull request #67 from mpeuster/master