Type of Class Error
Merge branch 'master' into Live