the-teacher Merge pull request #49 from luilver/master