Fixes #4 (tz support) and #5 (broken example)