first test and refactoring
Merge pull request #5 from AurumGallente/development

first test and refactoring