Merge pull request #9 from Baloche/dev

Merge pull request #8 from Baloche/master
Merge origin/master into dev
Code formatting for controllers