Develop to master

fix bugs