Now saves upon shutdown
Version bumped up to v0.3.1