Restrict requested features to what we need
Merge branch 'master' of https://github.com/ch4mpy/MBP.git