added parsing of timestamp and fixed datetime parsing from string