Merge pull request #1 from SecUpwN/master

update from original
Merge pull request #95 from He3556/master

Merge pull request #1 from SecUpwN/master