manully copied unmerged commit 527d87c from joeljackson:master, pull request #117
bumps version