Merge pull request #56 from fmorgner/master