changes to dispatcher
Merge pull request #18 from smcantab/master

changes to dispatcher