Merge pull request #54 from mpeuster/master