Misc
Merge branch 'master' of https://github.com/xowor/UniSO

Conflicts:
	src/agent.c
	src/tao.c