should work for v0.9.6 (not tested so far)