Merge pull request #16 from kraman/master

Adding CentOS support
Additional fixes for centos