Merge pull request #88 from roger-/master