performance improvement
interface improvement
Merge pull request #60 from Yaliang/master

performance and interface improvement