Merge pull request #227 from NoblesseOblige/master