Fixing some synchronization issues
Already synchronized
Merge pull request #592 from bhariharan/master

Fixing some synchronization issues