Added waf to branch