some changes
Merge remote-tracking branch 'vumedia/master'