Implemented https://github.com/depasonico/bywaf-owasp/issues/5 and https://github.com/depasonico/bywaf-owasp/issues/12