Update stuff
Merge branch 'master' of https://github.com/jthomm/el-pelotero