Merge pull request #73 from mpeuster/master