ship fix
Merge branch 'master' of https://github.com/bakwc/WDJ