To Sync or not to Sync?
Merge pull request #5 from Droppe/development

Sync for now.....to be removed(?)