Sync repo with changes #2