Merge pull request #48 from mpeuster/master