Fixed more bugs
Merge remote-tracking branch 'origin/master'
more bugs fixed