Merge pull request #10 from vihugarcia/master

Addes