Added token expiration

Ready to fork.