diff --git a/plot_elm_comparison.py b/plot_elm_comparison.py
index e8762d5..9ed93f2 100644
--- a/plot_elm_comparison.py
+++ b/plot_elm_comparison.py
@@ -54,7 +54,7 @@
   ELM(20,rbf(0.1))  :20 rbf units gamma=0.1
 
 """
-print __doc__
+print(__doc__)
 
 
 # Code source: Gael Varoqueux
@@ -69,7 +69,7 @@
 from matplotlib.colors import ListedColormap
 from sklearn.datasets import make_moons, make_circles, make_classification
 from sklearn.preprocessing import StandardScaler
-from sklearn.cross_validation import train_test_split
+from sklearn.model_selection import train_test_split
 from sklearn.linear_model import LogisticRegression
 
 from elm import GenELMClassifier
diff --git a/random_layer.py b/random_layer.py
index 713a795..52f459e 100644
--- a/random_layer.py
+++ b/random_layer.py
@@ -24,7 +24,7 @@
 from scipy.spatial.distance import cdist, pdist, squareform
 
 from sklearn.metrics import pairwise_distances
-from sklearn.utils import check_random_state, atleast2d_or_csr
+from sklearn.utils import check_random_state, check_array
 from sklearn.utils.extmath import safe_sparse_dot
 from sklearn.base import BaseEstimator, TransformerMixin
 
@@ -108,7 +108,7 @@ def fit(self, X, y=None):
         -------
         self
         """
-        X = atleast2d_or_csr(X)
+        X = check_array(X)
 
         self._generate_components(X)
 
@@ -130,7 +130,7 @@ def transform(self, X, y=None):
         -------
         X_new : numpy array of shape [n_samples, n_components]
         """
-        X = atleast2d_or_csr(X)
+        X = check_array(X)
 
         if (self.components_ is None):
             raise ValueError('No components initialized')