Fixed #10

Fixed #10