refactoring
add Context for D-Script
Merge pull request #116 from assureit/dscript_refactoring

Dscript refactoring