Upgraded and tested for ruby 2.1
Merge branch 'upgrade_ruby' into develop
Merge branch 'develop'