New version of swnp shutdown fix.
Merge branch 'develop' of github.com:diwa-aalto/diwacs into develop

Conflicts:
	swnp.py