Merge pull request #231 from trustmaster/master

Fixed #228
Fix for sync components #228