fix
Merge branch 'novatest' of github.com:shootstar/novatest into novatest