Fixes for Save and SaveAs
Merge pull request #22 from jjhall89/saveAndSaveAsFixes

Fixes for Save and SaveAs