Added waf to branch
Merge branch 'waf' into R