added circle configuration
Merge branch 'master' into centos6