Let file names match class names.
Moved a white space.
Update @version.
Improve return values. 

Set NULL if there is nothing, so FALSE can be a real value.