Added feature extraction and update main function
Merge branch 'develop'