refactoring done
Merge pull request #1 from delihiros/v0.2

refactoring done