Merge origin/master changes to make it work  in Centos