high priority bugs fixes
Merge remote-tracking branch 'origin/master'