Merge pull request #5 from RubyLouvre/master

Pull latest changes
Merge pull request #6 from RubyLouvre/master

Merge pull request #5 from RubyLouvre/master
Merge pull request #270 from kidneyball/master

Merge pull request #5 from RubyLouvre/master