Fixed #37. Fixed #38.