@@ -11,33 +11,46 @@ You can however also encode Geohashes down to the full available precision of a
 Building/Testing the code
 -------------------------
 
-The geohash-java code can be built using Apache Ant.
-Following targets are available:
+The geohash-java code can be built using Apache Ant or Apache Maven.
+Ant targets that are available:
 
 	- clean		# wash dishes.
     - compile	# compile the main source code.
     - test		# (default) run the unit tests.
     - jar		# pack a jar archive with the compiled class files.
     - zip 		# pack a zip archive with the compiled binaries, source code and all other files.
 
+Maven targets are the usual suspects.
+    
+    - compile
+    - test
+    - package
 
 TODO
 ----
 
 Current development involves getting the following things to run:
 
 -	a method to find the n closest hashes to any given point.
--	find all hashes within a bounding box (possibly including false positives)
 
 
 Last important changes
 ----------------------
 
--	Fixed issue #2 from Github:
+Version 1.0.2
+-------------
+
+-   Merged Kevins [ktcorby] code that yields all the geohashes in a bounding box, at a given resolution.
+- 	Merged Chris' [cchandler] code to encode and decode geohashes from a binary string.
+
+Version 1.0.1
+-------------
+
+-   Fixed issue #2 from Github:
 	- Neighbouring hashes can be calculated by using the getAdjacent() method, which yields a hashes 8 neighbors.
 	- northern, eastern, western and southern neighbours can be determined using the respective methods.
 
--	Fixed issue #1 from Github:
+-   Fixed issue #1 from Github:
 	- A bug caused different hashes to be yielded sometimes.
 
 
 
@@ -4,7 +4,7 @@
 	<groupId>ch.hsr</groupId>
 	<artifactId>ch.hsr.geohash</artifactId>
 	<packaging>jar</packaging>
-	<version>1.0.1</version>
+	<version>1.0.2</version>
 	<name>geohash-java</name>
 	<dependencies>
 		<dependency>
 
@@ -43,12 +43,9 @@ public void testIter2() {
             hashes.add(iter.next());
         }
         GeoHash prev = null;
-        int idx = 0;
-        //System.out.println("idx,lat,lon");
         for (GeoHash gh : hashes) {
             if (prev != null) Assert.assertTrue(prev.compareTo(gh) < 0);
             Assert.assertTrue(newBox.contains(gh.getPoint()));
-            System.out.println(idx++ + "," + gh.getPoint().getLatitude() + "," + gh.getPoint().getLongitude());
             prev = gh;
         }
Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,9 @@ public void testIter2() {`
`43`	`43`	`hashes.add(iter.next());`
`44`	`44`	`}`
`45`	`45`	`GeoHash prev = null;`
`46`		`- int idx = 0;`
`47`		`- //System.out.println("idx,lat,lon");`
`48`	`46`	`for (GeoHash gh : hashes) {`
`49`	`47`	`if (prev != null) Assert.assertTrue(prev.compareTo(gh) < 0);`
`50`	`48`	`Assert.assertTrue(newBox.contains(gh.getPoint()));`
`51`		`- System.out.println(idx++ + "," + gh.getPoint().getLatitude() + "," + gh.getPoint().getLongitude());`
`52`	`49`	`prev = gh;`
`53`	`50`	`}`
`54`	`51`