Fixing bug problem
Merge branch 'master' of github.com:moein/wtogo