Merge pull request #39 from mpeuster/master