Make class name detection more resilient to formatting.

Class name detection failed to pick up class names when
are not on the start of a line or if the class keyword was
not followed by one space.
Related to issue #19.