Overriden dispose method implemanted
Merge branch 'slave'