feature/one (rebased)

This is a new pull request for feature/one.
The branch was rebased because the PR became stale.
Original PR #2