update, bugfixes
Merge branch 'master' of https://github.com/philippeller/gen_ana
merge