Bug #25 - fixed redirection loop detection.
Merge branch 'bug_25' into master-dev