Refactoring
Merge pull request #63 from Fump/Refactoring

Refactoring