More minor changes.
Merge branch 'master' of https://github.com/danielskatz/WSSSPE