Bugs fixed .
Merge branch 'master' of github.com:gxbsst/starfire
Merge branch 'master' of github.com:gxbsst/starfire
bugs...