Fixed #47. Fixed #48.