Fix readme
Fix inner classes