One class added
Merge branch 'master' into Dev