Override Block bug fix
Manual merge
Update README.md
merge devel into master