Timer small changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Standard Library AS/src/timer.py
Fix
Some additions and fixes