Merge pull request #3 from codergreen/master

fixed timer bug
Merge pull request #4 from codergreen/master

Added Options