UP
Merge pull request #29 from delorenzana/master

update 100313
Merge pull request #30 from kvnanytv/master

UP
Merge pull request #11 from jbantug/master

update 100313