Merge pull request #3 from garrettw/master

Minor tweaks
Minor changes
fix merge conflict
Merge branch 'garrettw-master'
Merge pull request #4 from garrettw/master

Added timer functionality, removed publish methods
Merge pull request #5 from garrettw/master

Added new features
simplified timer code
added toggle switch for pending events functionality