Merge pull request #1 from jittat/master

Merge from origin
Update ruby version to 2.1.2
Merge pull request #4 from sarunint/master

Update ruby version to 2.1.2