Feature/fix sync

v0.2.1 release candidate.