Issue-27 Should return better result
Merge branch 'KaibinHuang-Issue-27' into feature/ruby-fixes
Language tweak