Modify: don't return 0 count feature
Merge branch 'feature_omit_zero' into develop