Merge pull request #210 from jehoffmann/master