diff --git a/ogn/__init__.py b/ogn/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ogn/parser/parse.py b/ogn/parser/parse.py
index f04c5d1..c5d9e61 100644
--- a/ogn/parser/parse.py
+++ b/ogn/parser/parse.py
@@ -15,8 +15,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     match_position = re.search(PATTERN_APRS_POSITION, message)
     if match_position:
         return {'name': match_position.group('callsign'),
-                'receiver_name': match_position.group('receiver'),
                 'dstcall': match_position.group('dstcall'),
+                'receiver_name': match_position.group('receiver'),
                 'timestamp': createTimestamp(match_position.group('time'), reference_date, reference_time),
                 'latitude': parseAngle('0' + match_position.group('latitude') + (match_position.group('latitude_enhancement') or '0')) *
                 (-1 if match_position.group('latitude_sign') == 'S' else 1),
@@ -32,8 +32,8 @@ def parse_aprs(message, reference_date=None, reference_time=None):
     match_status = re.search(PATTERN_APRS_STATUS, message)
     if match_status:
         return {'name': match_status.group('callsign'),
-                'receiver_name': match_status.group('receiver'),
                 'dstcall': match_status.group('dstcall'),
+                'receiver_name': match_status.group('receiver'),
                 'timestamp': createTimestamp(match_status.group('time'), reference_date, reference_time),
                 'comment': match_status.group('comment')}
 
diff --git a/ogn/parser/pattern.py b/ogn/parser/pattern.py
index c166e89..4093e1f 100644
--- a/ogn/parser/pattern.py
+++ b/ogn/parser/pattern.py
@@ -1,8 +1,8 @@
 import re
 
 
-PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):/(?P<time>\d{6})+h(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
-PATTERN_APRS_STATUS = re.compile(r"(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
+PATTERN_APRS_POSITION = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),((?P<relay>[A-Za-z0-9]+)\*)?.*,(?P<receiver>.+?):/(?P<time>\d{6})+(h|z)(?P<latitude>\d{4}\.\d{2})(?P<latitude_sign>N|S)(?P<symbol_table>.)(?P<longitude>\d{5}\.\d{2})(?P<longitude_sign>E|W)(?P<symbol>.)(?P<course_extension>(?P<course>\d{3})/(?P<ground_speed>\d{3}))?/A=(?P<altitude>\d{6})(?P<pos_extension>\s!W((?P<latitude_enhancement>\d)(?P<longitude_enhancement>\d))!)?(?:\s(?P<comment>.*))?$")
+PATTERN_APRS_STATUS = re.compile(r"^(?P<callsign>.+?)>(?P<dstcall>[A-Z0-9]+),.+,(?P<receiver>.+?):>(?P<time>\d{6})+h\s(?P<comment>.*)$")
 
 # The following regexp patterns are part of the ruby ogn-client.
 # source: https://github.com/svoop/ogn_client-ruby
diff --git a/tests/parser/test_beacon.py b/tests/parser/test_beacon.py
index eff74ea..23b80dd 100644
--- a/tests/parser/test_beacon.py
+++ b/tests/parser/test_beacon.py
@@ -16,6 +16,7 @@ class TestStringMethods(unittest.TestCase):
         message = parse_aprs("FLRDDA5BA>APRS,qAS,LFMX:/160829h4415.41N/00600.03E'342/049/A=005524 this is a comment",
                              reference_date=datetime(2015, 1, 1, 16, 8, 29))
         self.assertEqual(message['name'], "FLRDDA5BA")
+        self.assertEqual(message['dstcall'], "APRS")
         self.assertEqual(message['receiver_name'], "LFMX")
         self.assertEqual(message['timestamp'].strftime('%H:%M:%S'), "16:08:29")
         self.assertAlmostEqual(message['latitude'], 44.25683, 5)
diff --git a/tests/parser/test_parse.py b/tests/parser/test_parse.py
index 30d6bde..404e0ca 100644
--- a/tests/parser/test_parse.py
+++ b/tests/parser/test_parse.py
@@ -1,5 +1,6 @@
 import unittest
 import unittest.mock as mock
+import os
 
 from datetime import datetime
 from time import sleep
@@ -10,7 +11,7 @@ from ogn.parser.exceptions import AprsParseError
 
 class TestStringMethods(unittest.TestCase):
     def test_valid_beacons(self):
-        with open('tests/valid_beacons.txt') as f:
+        with open(os.path.dirname(__file__) + '/../valid_beacons.txt') as f:
             for line in f:
                 if not line[0] == '#':
                     aprs = parse_aprs(line, datetime(2015, 4, 10, 17, 0))