Fix readme
Fix inner classes
Merge pull request #1 from markkent/master

Minor cleanup