Merge pull request #87 from mpeuster/master