Fixed redirects and blank pages ... FINALY!
Corrected self.finish to self.write
Merge remote-tracking branch 'upstream/dev' into dev