Merge pull request #37 from its-dirg/id_token_fix

Allow the expiration time of the id_token to be specified.
Allow extra claims to be added to the id token.