Merged NAtre's fork manually

> That's all