Update Feature Extraction
Merge branch 'develop'

Conflicts:
	src/main.m