Fixed #40. Fixed #41.