Update mwas fork from master