@bit-pirate will follow this up in #161.