Fixing some mistakes
Merge origin/master