Small controller change
Merge branch 'master' of https://github.com/masidonion/jokr
2.0.2 -- Fixed viewer quit
temp
Merge branch 'master' of https://github.com/masidonion/jokr into Dinesh