class renamed
Small cleanup
README updated