User Story 1025 (issue #8)
Merge pull request #9 from srosemer/master

User Story 1025 (issue #8) - implementation completed.