fixes #58
DateTime conversion
Merge branch 'master' into performance_tests