Closed #173
Fixed #167