update from jackarain/protubuf