use ruby 2.1.2
Merge branch 'master' into develop
Merge pull request #2 from 10beat/develop

Develop