I mistaked \W for \s
Merge branch 'calc'

Conflicts:
	calc.py