Major Refactory
Merge pull request #10 from Nitjoo/master

Major Refactory