Fixed serializable bug
Merge branch 'development' into workername