BugFix #227 and #229
Merge branch 'master' of https://github.com/Firebusa/ARdevKit