Converted https://github.com/timvideos/getting-started/commit/117066149fc2b4794684ca8abb89bc7c2c6b81dc