Should fix #12
Update oxygen project