fix bugs
.
Merge branch 'master' of https://github.com/grao1991/driver