Merge pull request #2 from abzilla/master

more MVC