Make the time delta work
Fixed the confict
Merge pull request #53 from sposs/MoreFixes2

More fixes2