Merge fixes for Issue #72

Fix for #72 except it was decided to not add save as new to users.