Merge pull request #1 from anyTV/master

PULL
Merge pull request #18 from robertsambuena/master

Merge pull request #1 from anyTV/master