Fix bugs
Merge pull request #15 from ssov/master
Add Gemfile
Merge branch 'rkmathi/16'