o3 updates
Merge pull request #95 from yosefkurniawan/jojo

o3 updates