Generator working :-D
Merge branch 'dev' of github.com:markusmo/RiNaCluchi into dev