Merge pull request #86 from mpeuster/master