Resolves #2 (handle token expiration time)