Merging in changes from the repo the latests gem is based on

https://github.com/romanvbabenko/sakura https://github.com/romanvbabenko/sakura/pull/1