Added logger
Merge branch 'controller/sharon'
Edited author tag