Fix Save race condition
Merge pull request #17 from dsmall/master

Fixes a race condition in save command