Merge pull request #34 from fmorgner/master