Merge branch 'jvlomax-master'
improve config_parse_currency