[issue #17] enable save functionality
Merge branch 'feature/17-proper-save-functionality' into dev