slightly refactoring serialization
merge
refactoring some methods
Merge branch 'develop'
Merge branch 'master' into develop
merge