Changes to make it compile with myana
Merge branch 'developer' of github.com:antonbarty/cheetah into developer