Dev to master

Should be merged into master; its about time.
I think you should just drop the date field