Clean up imports.
Add toString for Features.
Merge remote-tracking branch 'origin/master'