Fix leak -- Fix #12
Add test with insert/date
More tests with insert/dates -- #13
Fix merge