merged match-level-multi-tasking branch to Dev

merged branches and fixed some issues.