Master now working on opal 0.6.x