more functionality
Merge remote-tracking branch 'origin/master' into features/deploy

Conflicts:
	Makefile
Merge pull request #2 from virgo-agent-toolkit/features/deploy

Features/deploy