Timestamps working
dn1 fixes
Merge pull request #23 from ne0n666/master

Dn1 fixes