Fixed #18
Fixed #19