Adding location fields. Issues #22 and #23