Fixes for https://github.com/spoqa/dodo/issues/1324
Merge pull request #9 from xymz/master

Fixes for https://github.com/spoqa/dodo/issues/1324