sorted out kafine's works to date
Merge remote-tracking branch 'origin'