Update data, small formatting changes to code.
Merge remote-tracking branch 'origin/master'