Bug fixing: remove corpus;
Added dynamic data converter
Merge remote-tracking branch 'origin/master'