GXImage + GXElement fixed
+
Merge remote-tracking branch 'Broadway/master'