Various small enhancements
Merge branch 'dev' of github.com:paullouisageneau/TeapotNet into dev