Make things actually work

kinda...
Merge pull request #173 from Open-Code-Developers/master

Make things actually work