bugfix for saving issue
Merge pull request #94 from DonDavici/bugfixes

bugfix for saving issue