Fixed Potential Compiler Problems
Merge branch 'master' of https://github.com/deadlymonkey/Crypto-Fall14