Merge pull request #54 from fmorgner/master