Updated to BS3.1 (and Fixed broken commit)