Merge pull request #29 from AoteChou/master

optimization
ad
Merge pull request #30 from AoteChou/master

m&a
m