Manual merge of #12. Thanks @alix-the-alicorn