Merge pull request #68 from mpeuster/master