Fixed #15
Fixed #3 #15