Merge pull request #34 from mpeuster/master