Merge pull request #2 from eXpl0it3r/master

Code + file clean up