Fixing error "Class 'string' Not Found!"

Because there is a fallback in the getPropertyClass function, which can return a 'string' then it is impossible to create a new 'string' object, therefore a fatal error is thrown.
Updating some code style
Merge branch 'Vilsol-patch-1'