Gud freakin' wizurd.  Also test case added.  Also merging to master now.