Some things moved from main class to readme
Merge remote-tracking branch 'origin'