Updated for consistency with code from video
Merge pull request #17 from keefekwan/patch-5

Updated for consistency with code from video