Incorporated cucharadepalo's fixes, now works with 0.11.x