Correctly implement acceptable filter selection
Merge remote-tracking branch 'origin/master'
Include both u and r band data.