Merge pull request #6 from abzilla/master

more MVC