Merge pull request #29 from ellerh/fix-save-input