Now tested with 0.6.4