Added qux
Added zoo
Added some +s
Merge branch 'newfeature3' into develop