Merge pull request #7 from Tneconni/master

commit after merge
Merge pull request #8 from DavidWangQD/master

Merge pull request #7 from Tneconni/master