refactoring
Merge pull request #5 from cstefanache/taires-branch

refactoring