sync w/ pytrick repo