Merge pull request #100 from mpeuster/master