Merge pull request #35 from cnd11/master

updated Controller
everything