Merge pull request #22 from mpeuster/master