Bug fixes.
Updated feature.
Merged.