Fixed #29. Fixed #30.