Merge pull request #2 from bbinet/optionnal-classes

Optionnal classes