Added some classes
Merge branch 'master' of github.com:mirelon/mm13