tweaky tweaky
Merge branch 'master' of https://github.com/morgondag/wstest

awesomeness