Revert "Revert "Merge branch 'master' of https://github.com/the-maldridge/whosin into the-maldridge-master""

This reverts commit 9ff7c38c7f7e1d391d23de1a1f54dd78a3823ab9.