Update README
Merge 'master' into demo
Update LICENSE & README
Merge 'master' into demo