Fixed some formatting & made debugging easier.
Merge remote-tracking branch 'origin/master'