fixing some issues
Merge branch 'master' of https://github.com/arshsab/K.A.R.E