Updated with last 0.9.10 build