Merge branch 'master' of github.com:assureit/ads
Merge branch 'dscript'