Doesn't work with field collection

Hi,
I have tried to use your module with addressfield and geofield as part of a field collection.
Both 7.x-1.0-beta5 version and 7.x-1.x-dev version don't work.
7.x-1.x-dev version reported an error at row 631 of addressfield_autocomplete.module in the function _addressfield_autocomplete_widget_get_field_value.
"undefined property $entity->type".
I have found that the offending row is
$bundle_name = $entity_type == 'taxonomy_term' ? $entity->vocabulary_machine_name : $entity->type;

With the field collection module $entity_type is always "field_collection_item" while $entity->type is not defined, but you can substitute it with $entity->field_name.

So I have solved the problem changing row 631 from

$bundle_name = $entity_type == 'taxonomy_term' ? $entity->vocabulary_machine_name : $entity->type;

to
if(!property_exists($entity, 'type') && isset($entity->field_name) )
{
$bundle_name = $entity->field_name;
}
else
{
$bundle_name = $entity_type == 'taxonomy_term' ? $entity->vocabulary_machine_name : $entity->type;

}

....
follows
$field_name = $instance['widget']['settings']['addressfield_autocomplete_field'];

$field_instance = field_info_instance($entity_type, $field_name, $bundle_name);

I have uploaded two files: one for the beta5 version and the other for the dev version; both seem to be working.