fix #190 issue
Merge remote-tracking branch 'fntzr/parse_string'