Merge pull request #3 from ellisonleao/master