         offsetEnd += remainder.length + 1
         # consume terminators to prevent empty statements
         offsetEnd++ if code[offsetEnd] == ';'
-        imp = /^(.*?), (.*)$/.exec remainder
+        imp = /^(.*?)[\s\t\n]*,[\s\t\n]*(.*)$/.exec remainder
         imp =
           fullMatch: code[offsetStart...offsetEnd]
           name: imp[1]

        offsetEnd: offsetEnd
      offset = offsetEnd
    
    rx = /import\(/
    for offset in [(code.length-1)..0]
      if match = rx.exec code[offset..-1]
        offsetStart = match.index + offset

    
  findFunctions: ->
    functions = []
    rx = /(\w+)[\s\t\n]+(\w+)[\s\t\n]*\([\s\t\n]*[\s\t\n]*(.*?)[\s\t\n]*\)[\s\t\n]*{/
    src = @src
    while match = rx.exec src
      offsetStart = match.index
