Tagged for 0.0.4 release w/ @rdoh's changes