add Tim quote
Merge branch 'hotfix/quote-tim'
Merge branch 'master' into develop