Merge pull request #1 from SecUpwN/master

update from original