Merge pull request #5 from RubyLouvre/master

Pull latest changes