Stashed because reasons

Going to master to solve the bug
Merge branch 'comms' of https://github.com/m2i/cysat into comms

Conflicts:
	src/command.c
	src/main.c
Commit for testing