Merge master updates - fix on readme and tabs