Return tokens and ptokens
Improve readability of readme
Lock hashie version