Fixed #14
Fixed #16