Converted https://github.com/timvideos/getting-started/commit/48bc08ffe872f7d3be83fa82c599a6df2b0ab1f6