Cleanup - remove references, reuse code.
Merge pull request #35 from Dmitry-Me/overridedisposablefrompackage

Cleanup - remove references, reuse code.