Latest project updates
Merge remote-tracking branch 'origin/master'
Slight commentary cleanup on fix by WillzZz