Made the parsing of timestamps more flexible.
Merge pull request #710 from jdgarrett/timestamp-fix

Made the parsing of timestamps more flexible.