Fix Serializable
Merge branch 'develop' into prod
Version v0.2.1
bumped minor minor version