Merge pull request #41 from mpeuster/master