Uncomment necessary parts
Merge branch 'developer' of github.com:antonbarty/cheetah into developer