fixed time stamp issue (s300)
Merge pull request #122 from ipa-josh/groovy_dev

fixed time stamp issue (s300)
Merge pull request #123 from ipa320/groovy_dev

timestamp fixes from groovy_dev