Merge pull request #53 from stephenvisser/master

Major changes to enable saving changes from the client