Added comments that timeouts are in milliseconds.
Merge remote-tracking branch 'leon-barrett/add-milliseconds-comments'