Fixes #624 Missing check to disable features
Merge pull request #625 from thatsIch/b-624-pickaxe

Fixes #624 Missing check to disable features