Merge pull request #173 from apenney/140-release