Development to master

fix some issue, need to fix python renovate because #143 (closed) and #142 (closed) keep showing up