full refactor
Merge pull request #393 from micheldumontier/release3

full refactor of taxonomy