Fixed small bug with new features.
Merge branch 'label_features'