Style fix
Update README
Add missing files
Merge branch 'develop'