Merge pull request #37 from fmorgner/master