Small changes
Fixed Radu's corrections
Merge remote-tracking branch 'origin/master'