Added Future to save and removed unnecessary completers 

please review changes, done changes through web editor
Merge pull request #37 from analogic/patch-1

Added Future to save and removed unnecessary completers