added doc on update.sh and fixed buffer switching issue with mappings
Merge remote-tracking branch 'origin/master'