Merge pull request #49 from fmorgner/master