Merge pull request #19 from jbantug/master

update 102113
update 102413
update 102813
Merge pull request #47 from delorenzana/master

update 102813