Merge pull request #12 from jbantug/master

update 100313B
update 100413
Merge pull request #34 from delorenzana/master

update 100413