Added left out types, and changed color around a bit to be more pleasing
Merge remote-tracking branch 'origin/master'