#19 fix convert from and to json