Merge pull request #72 from mpeuster/master