Revert "Merge pull request #1 from NickiSnow/master"

Reverts NickiSnow/WSP#2