fix bug in save method
Merge branch 'origin/feature_update'