up to eq 13
cosmetics
Merge remote-tracking branch 'dallan/master'