fix ruby 2.0 problem
Merge branch 'master' into smart-text