Make Twitter's @iotasamurai work, and @rummik not wrong

Fixes #8