refactoring
Merge pull request #35 from KnpLabs/refactoring

refactoring