Merge pull request #209 from jehoffmann/master