Implemented saving,loading,bug fixes,
Merge remote-tracking branch 'origin/master'