Merge pull request #4 from kelvinabrokwa/master

Update for Daniel Branch
Merge pull request #5 from kelvinabrokwa/Djruhnke-master

Merge pull request #4 from kelvinabrokwa/master