Merge pull request #2 from stuntguy3000/master

A few changes here and there
Allow configuration of timing