Integrating changes from Mistobaan's fork