Refactored model - it's a good idea to override a no parameter Constructor
Merge remote-tracking branch 'origin/master'