Refactoring
Merge pull request #4 from rootzid/development

Refactoring