Pull form asweigart

Pull to keep updated my fork