Bug fix (?)
Single-component must not return multi-value.
Merge branch 'master' of git://github.com/flavour/eden