Merge pull request #1 from packetfocus/master

moving this branch to current
The beginning of making this modular
Merge pull request #4 from gen0cide-/fix

getting skrong