Bugfix for #97, minor fix for FeatureActivation module
Merge with master