Merge pull request #38 from larshesel/master