forgotton changes at home
Merge branch 'master' of https://github.com/mattflor/wspec

Conflicts:
	core.py
	scenario001.py