Merge pull request #2 from SecUpwN/master

update from original 3