Added all updated files
Changes merged from viboes repo