Added comments, merged files together, microSeconds
Merge remote-tracking branch 'origin/master'