Refactor
Merge pull request #1 from gkze/master

Refactoring