nonlinear encoders
Merging release into master.