fixed merge to 0.9.8
Gemfile.lock