Regex and moved the empty field check to a new class
Merge branch 'master' of https://github.com/paarseschep/barrocIt.git