Merge pull request #13 from jbantug/master

update 100413
update 100413B
Merge pull request #35 from delorenzana/master

update 100413B