Merge pull request #401 from techee/waf