Merge branch 'feature/serialization' (issue #75)