Merge pull request #2 from WebDevStudios/master

update
Fix issue #22
Merge pull request #41 from BrunoRamalho/master

Fixed #22. Props @BrunoRamalho.