updated kauha logic
Merge remote-tracking branch 'origin/master'
fixed warnings and dont know what else did I do
Merge remote-tracking branch 'origin/master'