Fixed #44. Fixed #45.