improved version with timestamps and HH:MM:SS support
Merge pull request #1 from SimonWaldherr/master

improved version with timestamps and HH:MM:SS support