Fix files to remove audit violations
Merge pull request #54 from R2-Team2/code_audit_20141124

Fix files to remove audit violations