added wiffy per issue #170, this needs a reference to issue #233