v.0.3: wave support