small test
fixing stuff
Merge branch 'master' into develop
Missing some defaults included in master :)