Merge pull request #20 from jbantug/master

update 102813
update 103013
update 110513
Merge pull request #50 from delorenzana/master

update 110513