Merge pull request #26 from mpeuster/master