Fixed #27. Fixed #29