Merge pull request #53 from fmorgner/master