Fix some bugs
Merge branch 'master' of github.com:johnjohnlin/3dmm_final
Merge remote-tracking branch 'upstream/master'