Merge pull request #1 from demattia/master

need new code
Merge pull request #7 from zhenhu/master

Merge pull request #1 from demattia/master