Fixed some bugs
Merge remote-tracking branch 'GitHub/master'