Added third feature.
Added fourth feature.
Merged "feature" branch.