Fortify fixes
Merge branch 'm5'
Just merge it
Merge pull request #38 from sjklein92/master

Fotify fixes