Merge pull request #1 from kelvinabrokwa/Djruhnke-master

Djruhnke master
Merge pull request #19 from Djruhnke/master

Merge pull request #1 from kelvinabrokwa/Djruhnke-master