Merge branch 'master'
Finish Refactor BelugaDemo