fixed timestamp conversion to work on windows
merge conflicts