Merge pull request #36 from mpeuster/master