fixed compiling errors and a little refactoring
Merge branch 'master' of git@github.com:benjholla/AuditMon.git