Implemented User Story X (issue #11)

Issue #11 is implemented