Re-licensed as 2-clause BSD (with consent from myself)