Awesum controller support
Merge branch 'roblabla'