Merge John's fork into alim4