Merge pull request #35 from daven009/master

Updates
Merge pull request #36 from daven009/master

Bugfix
Merge https://github.com/ycswaves/yamatoV09
Update

Timer helpers
(Unsolved: timer and session gone after refresh)