Merge branch 'master' of https://github.com/briacp/jergoviewer
Merge branch 'master' of https://github.com/briacp/jergoviewer