use millisecond since Unix Epoch for dates for easier sorting
Merge remote-tracking branch 'origin/master'