diff --git a/picas/batchid.py b/picas/batchid.py
index 11e4228..a668ab5 100644
--- a/picas/batchid.py
+++ b/picas/batchid.py
@@ -1,4 +1,4 @@
-
+# -*- coding: utf-8 -*-
 from os import environ
 
 ''' @author Maarten Kooyman '''
diff --git a/picas/documents.py b/picas/documents.py
index b457548..6a34a6f 100644
--- a/picas/documents.py
+++ b/picas/documents.py
@@ -4,7 +4,7 @@
 import base64
 import traceback
 from uuid import uuid4
-import batchid
+from . import batchid
 
 ''' @author Joris Borgdorff '''
 
diff --git a/picas/modifiers.py b/picas/modifiers.py
index a2dd0bb..7e3d700 100644
--- a/picas/modifiers.py
+++ b/picas/modifiers.py
@@ -8,8 +8,7 @@
 # Python imports
 import socket
 import time
-import batchid
-
+from . import batchid
 
 class TokenModifier(object):