add implementation of item 6 from requirements.
Merge remote-tracking branch 'origin/master'