diff --git a/setup.py b/setup.py
index aaecdf1..3fdda58 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(name='yandex_connect',
-      version='0.28b0',
+      version='0.29b0',
       description='API Yandex Connect',
       url='http://github.com/zt50tz/yandex-connect',
       author='Alexeev Nick',
diff --git a/yandex_connect/base.py b/yandex_connect/base.py
index 212d942..2de90c8 100644
--- a/yandex_connect/base.py
+++ b/yandex_connect/base.py
@@ -17,15 +17,18 @@ import base64
 
 def token_get_by_code():
     import requests
-    print ('Attempt to get oauth token for app')
+    print('Attempt to get oauth token for app')
     client_id = input('Client id: ')
     client_secret = input('Client secret: ')
-    print ('Open link in browser:')
-    print ('https://oauth.yandex.ru/authorize?response_type=code&client_id=%s' % client_id)
+    print('Open link in browser:')
+    print('https://oauth.yandex.ru/authorize?response_type=code&client_id=%s' % client_id)
     code = input('Enter code: ')
 
     auth = '%s:%s' % (client_id, client_secret)
-    auth_base64 = base64.encodestring(auth.encode()).decode("utf-8")
+    if hasattr(base64, 'encodebytes'):
+        auth_base64 = base64.encodebytes(auth.encode('utf-8')).decode('utf-8')
+    else:
+        auth_base64 = base64.encodestring(auth.encode()).decode("utf-8")
     headers = {
         "Authorization": "Basic %s" % auth_base64.replace('\n', '').strip()
     }
@@ -37,7 +40,7 @@ def token_get_by_code():
             'code': code
         }
     )
-    print (r.text)
+    print(r.text)
 
 
 def json_prepare_dump(obj):
@@ -179,7 +182,7 @@ class YandexConnectRequest(object):
                 msg = r.text
             if 500 <= r.status_code <= 599:
                 if retry_count <= self._retry_max:
-                    return self(name, data=data, method=method, retry_count=retry_count+1)
+                    return self(name, data=data, method=method, retry_count=retry_count + 1)
             raise YandexConnectExceptionY(r.status_code, msg, url, kwargs)
         if method == 'delete':
             return True
diff --git a/yandex_connect/directory.py b/yandex_connect/directory.py
index 21ecedb..acbb705 100644
--- a/yandex_connect/directory.py
+++ b/yandex_connect/directory.py
@@ -72,7 +72,7 @@ class YandexConnectDirectory(YandexConnectBase):
         :param nickname: nickname / email
         :return: int
         """
-        if nickname.find('@'):
+        if nickname.find('@') > -1:
             nickname = nickname[:nickname.find('@')]
         if 'user_id_by_email' not in self.cache:
             self.cache['user_id_by_email'] = {}