Merge pull request #38 from fmorgner/master