diff --git a/mros2_header_generator/header_generator.py b/mros2_header_generator/header_generator.py
index 88f8d59..a7e42f5 100644
--- a/mros2_header_generator/header_generator.py
+++ b/mros2_header_generator/header_generator.py
@@ -4,6 +4,7 @@
 import sys
 import re
 from jinja2 import Environment, FileSystemLoader
+from os import path
 
 arg = sys.argv
 msgFile = arg[1]
@@ -21,7 +22,7 @@ def main():
 
     # generate header file for mros2
     for msg in msgs:
-        env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator'))
+        env = Environment(loader=FileSystemLoader(path.dirname(__file__)))
         template = env.get_template('header_template.tpl')
         datatext = template.render({ "msg": msg })
         
@@ -42,7 +43,8 @@ def genDepMsgHeader(genMsg):
     msgs=[]
     msgs.append(msgDataGenerator(genMsg.strip()))
     for msg in msgs:
-        env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator'))
+        env = Environment(loader=FileSystemLoader(path.dirname(__file__)))
+
         template = env.get_template('header_template.tpl')
         datatext = template.render({ "msg": msg })
         
diff --git a/mros2_header_generator/msg_data_generator.py b/mros2_header_generator/msg_data_generator.py
index 01a2370..3be8cf4 100644
--- a/mros2_header_generator/msg_data_generator.py
+++ b/mros2_header_generator/msg_data_generator.py
@@ -10,7 +10,9 @@ def msgDataGenerator(line):
             arr = m_f.readlines()
             msgDef = []
             for m_line in arr:
-                msgDef.append(msgDefGenerator(m_line, dependingFileNames))
+                stripped_line = m_line.strip()
+                if stripped_line == "": continue
+                msgDef.append(msgDefGenerator(stripped_line, dependingFileNames))
 
         lineArr = line.strip().split('/')
         lineArr[2] = os.path.splitext(lineArr[2])[0]