Added new classes
Merge branch 'master' of https://github.com/Ico91/Ma-DeSy