Adding missing stuff from last commit
Merge remote-tracking branch 'origin/master'