added checking for wps
Merge branch 'master' of github.com:bergeraaron/wbf