Wrong timer and round values fixed
Merge branch 'master' of https://github.com/abronan/heirloom