Fix some errors.
Merge branch 'master' of github.com:densl/test