Fixed issues #10, 11, and 12