Updates for Ruby 2.1
Merge pull request #5 from hybridgroup/master

Updates for Ruby 2.1