GemUpdate2
merged branches