fixed titles bug
Merge branch 'master' into djk-fix-titles
blahh