only leave demo that works
Merge branch 'wc' into 0.9