Prepared version 0.8.4