Minor refactoring, added error message to Log
Merge branch 'master' of https://github.com/celloman/GREPapp.git