Fixed #27
Fixed #26