Merge branch 'develop'
update README.md
fix compatiblity with clang
Merge branch 'master' into develop