New classes, cf issue #103
Merge pull request #105 from Phyks/dev

New classes, cf issue #103