merge flextgl branch