Sync with current server snapshot + Fixes #31