Merge the fork by Amekmani