Refactoring Model class
Merge branch 'master' of github.com:baeda/sep2