Merge pull request #9 from jbantug/master

update 100213
refactoring
Merge pull request #28 from delorenzana/master

refactoring