fixed connection refused error
Merge branch 'master' into vnet-test

Conflicts:
	demo_application/Makefile
bup
+ args