minor bugs are fixed
Merge remote-tracking branch 'origin/development' into video-recording