Merge pull request #25 from ellerh/implement-save-input