diff --git a/kaa/__init__.py b/kaa/__init__.py
index 3e3eae5b..cfa642a9 100644
--- a/kaa/__init__.py
+++ b/kaa/__init__.py
@@ -1,9 +1,17 @@
+# Various package-level initializations goes here.
+# Any non-essential variables should be del-ed,
+# so we don't clutter kaa.* namespace.
+
+
+# Version data from `versioneer` script.
 from ._version import get_versions
 __version__ = get_versions()['version']
 del get_versions
 
 
+# We initialize logging outside _kaa module,
+# since the module itself is used in logging configuration
+# dict, causing import issues.
 from .log import _initialize_kaa_logging_config
-
 _initialize_kaa_logging_config()
 del _initialize_kaa_logging_config
diff --git a/kaacore b/kaacore
index e8ab5870..0fd65175 160000
--- a/kaacore
+++ b/kaacore
@@ -1 +1 @@
-Subproject commit e8ab58700303ae2c5cf7c385a0d47db931990cf4
+Subproject commit 0fd65175758d7fafa3121f6eee5cb962e4b72e42