DST correction
Merge https://github.com/brantmerrell/DST