Fix bug on feature extraction function
Merge branch 'develop'