Refactored some codes, changed class methods to instance methods
Minor Fixes
Merge pull request #4 from eddieespinal/develop

Good to merge