updated with the last 0.9.11 version