Added fixes from user vansante manually
Merge remote-tracking branch 'origin/master'