Merge pull request #32 from WClement/master

wooo
FIXED SO MUCH. TIMERS AND STUFF. SMOKE WEED ERRYDAY.