Prepared version 0.9.7