push me fork to merge branches

Слиты nikitronn запросил слияние github/fork/AgustinJB/master в master

Created by: nortikin

this is my first asking of pull for somebody's fork.