Resolves 5.a, 5.b, 5.c, 5.d
Merge branch 's5abcd'
removed all of the comments
refactored spec
Merge branch 'log-hotfix'