Fixed #190; Merged and closed #191.