Fixed model binding + refactoring
Merge branch 'master' of https://github.com/MacsDickinson/DoctorClockwork