Teddy & Jean Kismet fixes / refactoring
Merge remote-tracking branch 'github/master'