Merge pull request #29 from mpeuster/master