removed unlogical test
fixed constructor complexity
fixed constructor complexity
Merge pull request #5 from rubenCodeforges/refactoring

Refactoring