Update timer fixes
Updated test time
Merge pull request #4 from jrgrafton/gh-pages

Merging gh-pages back to master