Allow configuration of redirect uri in client
fixed merge conflicts on #88 allow configuration of redirect uri in client