Merge for version 0.9.2.5
Conflicts:
	wos.py