Bugfix
Merge branch 'gen-taudecay'