returnUrl no longer required
Option to use custom returnUrl
Merge branch 'refactor/return-url'