diff --git a/plugins/geocoder_handler/google.inc b/plugins/geocoder_handler/google.inc
index 5b1ddb9..8f28c03 100755
--- a/plugins/geocoder_handler/google.inc
+++ b/plugins/geocoder_handler/google.inc
@@ -32,6 +32,20 @@ function geocoder_google($address, $options = array()) {
       'sensor' => 'false',
     );
 
+    if (!empty($options['bounds'])) {
+      $query['bounds'] = $options['bounds'];
+    }
+
+    if (!empty($options['components'])) {
+      // Construct the right query string
+      $query['components'] = implode(
+        '|',
+        array_map(function ($key, $value) {
+          return $key . ':' . $value;
+        }, array_keys($options['components']), $options['components'])
+      );
+    }
+
     $url = url("http://maps.googleapis.com/maps/api/geocode/json", array('query' => $query));
     $result = drupal_http_request($url);