ISSUE #18 has been completed. Fixed bug with redirects