Merge pull request #23 from jinxcat/master

 fix serialisation problem of window timestamps