Committing to synch with master doc
Fixed conflicts in timer.c