Handled several devices
Merge pull request #7 from glatorre/timestamp_markers

Handled several devices