Fix memory leak in command handler

[Mnenmenth]

Fix memory leaks in command handler from dangling pointers

This also reworks the function parameters to take references

This resolves #10