Added some new classes
Merge branch 'master' of https://github.com/thomt/Innutrac