Merge from John
treef98d1673df058ec499b2270b86bdfa82a02e51c5
-rw-r--r-- 6872 README
-rw-r--r-- 1041 Rakefile
drwxr-xr-x - lib
drwxr-xr-x - test