Merge branches 'master' and 'alarmclock'
changed README.md for clarity
Merge commit 'e384e65' into alarmclock