Use feature numbers instead of feature names
Fixed test failures
Merge pull request #35 from marco-c/dont_use_feature_names

Use feature numbers instead of feature names