Started Changes for Online-Sync
Merge pull request #47 from broggi/master

Started Changes for Online-Sync