Simple refactoring
Merge pull request #1 from wazery/development

Simple refactoring