Fix Dispose method
Merge branch 'dev' of github.com:Azure/azure-sdk-tools into profile
Address code review