Begin working on feature2.
Second (final) step.
Merge pull request #2 from lslah/feature2

Merging feature2 since it was nicely rebased on top of master.