Merge pull request #1 from rjdkolb/master

pull
Merge pull request #1 from Jozi-JUG/master

Merge pull request #1 from rjdkolb/master