MVC-2 fix, MVC-42 implemented.
Merge branch 'master' of github.com:Diana22/ProjectMVC