- Updated with minor location bug fix