Some fixes for CentOS 6.5
Merge branch 'master' of https://github.com/armoredsoftware/code