Added new line support
Fixed small bug