Fixed #10.  Fixed #11.