Update develop

Add modules.
Update README.md.
Minor fixes.