bugfixing json and updated tostring for model
bugfixing json and updated tostring for model
Merge origin/master