Changes

pulls from development branch
change Kali detection method