Merge pull request #219 from hnyman/WPS-toggle