Pull tz:patch-1 (PR #91)