Miguel's comments
Merge pull request #4 from miguelsousa/master

Miguel's comments