Second attempt

Another try at a pull request, with proper multiline support