bug fixes and return url fix
Merge remote-tracking branch 'origin/master'