Merge pull request #98 from mpeuster/master