Commit a version of the patch for #125 for testing.

Originally submitted by:	@i2aaron