Controller fixes
Merge branch 'develop' of https://github.com/bercium/startupstarter.git into develop