Audit fix. No critical flags anymore!
Merge pull request #69 from R2-Team2/bugFix-100-auditFix-0312

Audit fix. No critical flags anymore!