Merge pull request #4 from AngeloMendes/master

ok