Updated README.
Minor corrections.
Added placeholders for demo.
Merge branch 'develop'