added login and token support
Merge branch 'master' of github.com:OrenBochman/WRAP