Transformator/ClassConstant

Resolve #588
Fix #583
I do not understand what's on your mind.