Merge pull request #273 from jdubois/master