Little fixes to demo2
Fixes to demo4
Merge branch 'master' of github.com:Chiru/WeX