refactoring
Merge pull request #9 from boolfool/development

refactoring