Jaide's update
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from JaideHaynes/master

take it and go