Merge pull request #393 from micheldumontier/release3

full refactor of taxonomy
Merge pull request #394 from micheldumontier/release3

Release3 update