Merge pull request #2 from zarachini/master

By Zaracho