Merge pull request #21 from jbantug/master

update 110513
update 110613
update 111113
Merge pull request #51 from delorenzana/master

update 111113