refactor code
Merge pull request #4 from djamah/master

refactor code