Merge branch 'master' into 20140311_edit
latest
Merge branch 'master' of https://github.com/TakahikoYoshii/ConvertNumerals