Merge pull request #1 from SecUpwN/master

syncing my fork 2