Refactoring
Merge pull request #3 from rootzid/development

Refactoring