commit with ward 1.0.6
completed origin merge