Fixed #21. Fixed #27.