Merge pull request #1 from Wasper/dev

Controller update
Skeleton structure