Fixes issue #47
I think dates are good to go for testing. #46