revert to old feature set and implement feature selection
add ref url to feature selector
Merge branch 'master' into feature