Fixed #2
Fixed #23