Merging

Merge branch 'master' into controller_view
Finished for Today
Merge pull request #5 from n-zeplo/controller_view

Controller view