BugFix on Gal and Merge with jemma master