Fixed unrecognition of class, but now many bugs at runtime
Merge origin/master