Merge ALFA0.1