Merge pull request #54 from bravewick/master

Sprint R5 - hardening and CEF
Merge pull request #55 from bravewick/master

Sprint R5 - hardening and CEF