Arreglado
Merge branch 'Toni' of https://github.com/khiven/com.khiven.blockfix.git
into Toni