Refactoring
Merge pull request #7 from sydekumf/master

Refactoring