@@ -8,7 +8,9 @@
  */
 package ch.hsr.geohash;
 
-public class BoundingBox {
+import java.io.Serializable;
+
+public class BoundingBox implements Serializable {
 	private double minLat;
 	private double maxLat;
 	private double minLon;
 
@@ -8,10 +8,11 @@
  */
 package ch.hsr.geohash;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public final class GeoHash implements Comparable<GeoHash> {
+public final class GeoHash implements Comparable<GeoHash>, Serializable {
 	private static final int[] BITS = { 16, 8, 4, 2, 1 };
 	private static final int BASE32_BITS = 5;
 	public static final long FIRST_BIT_FLAGGED = 0x8000000000000000l;
 
@@ -8,11 +8,13 @@
  */
 package ch.hsr.geohash;
 
+import java.io.Serializable;
+
 /**
  * {@link WGS84Point} encapsulates coordinates on the earths surface.<br>
  * Coordinate projections might end up using this class...
  */
-public class WGS84Point {
+public class WGS84Point implements Serializable {
 
 	private double longitude;
 	private double latitude;
 
@@ -8,6 +8,7 @@
  */
 package ch.hsr.geohash.queries;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +22,7 @@
  * either 1,2 or 4 susch hashes, depending on the position of the bounding box
  * on the geohash grid.
  */
-public class GeoHashBoundingBoxQuery implements GeoHashQuery {
+public class GeoHashBoundingBoxQuery implements GeoHashQuery, Serializable {
 
 	/* there's not going to be more than 4 hashes. */
 	private List<GeoHash> searchHashes = new ArrayList<GeoHash>(4);
 
@@ -8,6 +8,7 @@
  */
 package ch.hsr.geohash.queries;
 
+import java.io.Serializable;
 import java.util.List;
 
 import ch.hsr.geohash.BoundingBox;
@@ -19,9 +20,9 @@
  * represents a radius search around a specific point via geohashes.
  * Approximates the circle with a square!
  */
-public class GeoHashCircleQuery implements GeoHashQuery {
+public class GeoHashCircleQuery implements GeoHashQuery, Serializable {
 	private double radius;
-	private GeoHashQuery query;
+	private GeoHashBoundingBoxQuery query;
 	private WGS84Point center;
 
 	/**