bug fixed
conflict fixed
bug fixed
Merge branch 'master' of github.com:VectorWinner/Kdann