clean the code
Merge pull request #8 from jangelroa/master

clean the code