Fixed Class Name
Merge branch 'master' into UnitTests