Signed-off-by: GSamuel <gideon_hoog@hotmail.com>
Merge pull request #4 from GSamuel/Gideon-Branch

Gideon branch
Signed-off-by: GSamuel <gideon_hoog@hotmail.com>
Merge remote-tracking branch 'origin/master' into Marcel-Branch
Merge remote-tracking branch 'origin/Gideon-Branch' into Marcel-Branch