Merge pull request #393 from jgknight/develop

Fix incorrect usage of date()