Dev branch 0.7.8