Code Cleaning
Merge pull request #4 from orakzai/master

Code Cleaning