Resolve "UnboundLocalError: local variable 'match' referenced before assignment" Closes #50 See merge request !139