Refactoring
Merge pull request #16 from rezzza/refactoring

Refactoring