fixed #48 and #40
Merge branch 'bugfix/trigger-save-button' into release/0.1