Another fix for bugs in Canaries's validator.
Another fix for bugs in Canaries's validator.

OnWithLife/brainbrowser,rdvincent/brainbrowser,juanprietob/brainbrowser,juanprietob/brainbrowser,OnWithLife/brainbrowser,rdvincent/brainbrowser,juanprietob/brainbrowser,rdvincent/brainbrowser,juanprietob/brainbrowser,OnWithLife/brainbrowser