Merge branch 'diasclases_changes'
Merge branch 'master' of https://github.com/josuechavarria/diasclases