Merge pull request #51 from fmorgner/master