Make some bugfix!
Merge branch 'master' of github.com:zhangpf/volt