Added namespace and cleaned files
Merge pull request #2 from didehvar/master

Added namespace and cleaned files