Adding new classes for 0.7 compliance
Merge pull request #7 from antoinesd/master

Adding new classes for 0.7 compliance