Merge pull request #105 from mpeuster/master