now work with ruby 2.1.0 or later & some improvements
Merge remote-tracking branch 'origin/master'