Merge pull request #39 from fmorgner/master