comment
add P_o for naive fusion
comment
error fix
Merge branch 'develop'