First implementation proposal dealing with existing features.
Merge remote-tracking branch 'origin/master'