Merge pull request #5 from gini/refactoring

Refactoring