fixed bugs and cleaned up code for jaring
fixed bugs and cleaned up code
Merge branch 'master' of https://github.com/ccarlton/WhatWhere