fixes for demo
Merge branch 'master' of https://github.com/Cyberlightning/Cyber-WeX.git