Pull changes in Andrie's fork