Sandile commits
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from sandilem29/master

sandile made changes