Merge pull request #1 from abzilla/master

more MVC