Fixing coordination logic.
Merge pull request #21 from iuj/master

Fixing coordination logic.