Fixed timing bugs
Merge branch 'master' of https://github.com/Sanatrath/got-merged