Focus on dispatcher - during dock/undock this causes problems
Merge pull request #19 from chandramouleswaran/v0.2

Focus on dispatcher - during dock/undock this causes problems