bug n Fixes are fixed
Merge branch 'dev' of https://github.com/Innostark/Cares into dev