Code Refactoring
Merge pull request #79 from mshamash/master

Code Refactoring