Merge branch 'hotfix/fix_bugs'
added code to track down a bug ocurring on production
Merge branch 'hotfix/bug_fix' into develop