Step 2.1

This pull request implements the step written in issue #14.