Changed to work with the fork on github/felipesotero