Updated to OASIS 0.4.x, release 0.7