Model: Changed the Methods to get and set data.
Merge remote-tracking branch 'origin/model'
Merge remote-tracking branch 'origin/master' into GUI