performed refactoring
Merge pull request #76 from niyaton/refactoring-debug-command

performed refactoring