Merge pull request #102 from mpeuster/master