Taking updates from the formerly official repo, which is no longer maintained.