Merge pull request #62 from Q0rDev/refactor

merge refactor onto master.