fixed some issues when merged with master
Merge remote-tracking branch 'origin/master'