Fixed #90
Fixed #2