Some fixes. Some changes. Nothing esspetional.
Merge remote-tracking branch 'origin/master'