Fixed #42
Fixed $41