Added tokens and security
Merge branch 'master' of github.com:formigone/monad