Refactoring save validation
Merge branch 'master' of github.com:clocklimited/Catfish