add doc string support
Separate class and function definitions.
Added self
Merge pull request #2 from rjn945/master

Other updates