Merge pull request #149 from reallyenglish/mitsuruy

cherry-picked: Update to 0.17