update from centos
update from master branch
fix issue 53
fix the conflicts
fix issue 1
master updated
merge with issue1
fix issue 2
the master branch updated
merge with issue2
the master branch
fix issue #3
merge with issue3 branch
merge with remote master branch