Added redirect support and some clean-up
Merge branch 'master' of github.com:hhariri/wasabi