fix for the double save bug
Merge pull request #1145 from Tendrid/develop

fix for the double save bug
Merge pull request #1144 from brooksryba/develop

Develop