Include time.h on win systems
Merge branch 'development'