some modification and augment
Merge pull request #1 from AoteChou/master

some modification and augment