Fixed #12
Fixed #6