diff --git a/R/parser.R b/R/parser.R
index 6db5de7d..32f7ebf4 100644
--- a/R/parser.R
+++ b/R/parser.R
@@ -13,8 +13,9 @@ read_services <- function(file){
 
   services <- list()
   pkg <- ""
-
-
+  
+  import_files <- getOption("import_files", default=as.null())
+  
   doServices <- function(i){
     service_name <- tokens[i+1]
     # services[[service_name]] <<- list()
@@ -54,8 +55,11 @@ read_services <- function(file){
     services[[rpc_name]] <<- fn
     return(i)
   }
-
-  readProtoFiles(file)
+  
+  if(is.null(import_files))
+    readProtoFiles2(file)
+  else
+    readProtoFiles2(file, protoPath=import_files)
 
   lines <- readLines(file)