resolved #44
resolved #44
resolve conflict
resolve conflict
resolved #51
Merge pull request #52 from champierre/51_altanate_location_if_no_spot_exists

51 altanate location if no spot exists