wsh review
Merge pull request #3 from Eric-Brison/wsh

wsh review