Debugging threading problem
Merge remote-tracking branch 'origin'
Re-added categorize button