Merge pull request #8 from jbantug/master

update 093013
update 100113
Merge pull request #25 from delorenzana/master

update 100213