Merge remote-tracking branch 'origin/master'

fix some bugs
Merge branch 'master' of https://github.com/Firebusa/ARdevKit