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

Conflicts:
	index.js
Merge branch 'master' of github.com:moein/wtogo