https://github.com/windylee/tz/issues/59
Merge remote-tracking branch 'origin/master'