Check variables: move regexp to class, improve checks
Merge pull request #317 from flodolo/improve_variablecheck

Check variables: move regexp to class, improve checks