remove and add some bugs
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git
Merge branch 'master' of https://github.com/dzigerlig/CDAR.git