add o3 support (fix thnx to castagnait)