Fixed #10. Fixed #23.