testing
trying
merge
fixed
working again
Merge pull request #29 from ieatkimchi/ws_mobile

Ws mobile
Merge branch 'master' into testing