diff --git a/.gitmodules b/.gitmodules
index a6a4dd4..a4c3483 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "inst/include"]
 	path = inst/include
-	url = https://github.com/greg7mdp/sparsepp.git
+	url = https://github.com/dselivanov/sparsepp.git
diff --git a/DESCRIPTION b/DESCRIPTION
index 943fc3b..2ea9a1b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: sparsepp
 Type: Package
 Title: 'Rcpp' Interface to 'sparsepp'
-Version: 0.1.2
-Date: 2017-01-22
+Version: 0.2.0
+Date: 2017-08-07
 Authors@R: c(
   person("Gregory", "Popovitch", role = c("aut", "cph"), email = "greg7mdp@gmail.com"),
   person("Google Inc", role = c("aut", "cph")),
@@ -16,7 +16,7 @@ Description: Provides interface to 'sparsepp' - fast, memory efficient hash map.
     memory usage (especially when the final size of the map is not known in advance).
 License: BSD_3_clause + file LICENSE
 Encoding: UTF-8
-URL: https://github.com/greg7mdp/sparsepp, https://github.com/dselivanov/sparsepp
-BugReports: https://github.com/dselivanov/sparsepp/issues
+URL: https://github.com/greg7mdp/sparsepp, https://github.com/dselivanov/r-sparsepp
+BugReports: https://github.com/dselivanov/r-sparsepp/issues
 Suggests: Rcpp
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1
diff --git a/README.md b/README.md
index fce94b9..d557d5e 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,12 @@ To use C++ code from `sparsepp`:
 
 1. In DESCRIPTION, add `LinkingTo: sparsepp`.
 1. In the C++ file, add:
-  `#include <sparsepp.h>`
+  `#include <sparsepp/spp.h>`
 
 ## Simple example
 
 ```c++
-#include <sparsepp.h>
+#include <sparsepp/spp.h>
 using spp::sparse_hash_map;
 sparse_hash_map<string, int> smap;
 ```
@@ -27,7 +27,7 @@ sparse_hash_map<string, int> smap;
 #include <iostream>
 #include <functional>
 #include <string>
-#include <sparsepp.h>
+#include <sparsepp/spp.h>
 
 using std::string;
 
diff --git a/cran-comments.md b/cran-comments.md
index 5581700..4eef17e 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -1,6 +1,6 @@
 ## Test environments
 
-* local OS X install, R 3.3.1
+* local OS X install, R 3.4.0
 * win-builder (devel)
 
 ## R CMD check results
diff --git a/inst/include b/inst/include
index 2d9eca0..b21d1bd 160000
--- a/inst/include
+++ b/inst/include
@@ -1 +1 @@
-Subproject commit 2d9eca0f1d5fe8ba00bb78eba0106c05c28ee277
+Subproject commit b21d1bd744e5a9e94708df022c05bff462755a69
diff --git a/man/sparsepp-package.Rd b/man/sparsepp-package.Rd
index b0955f0..a6fde79 100644
--- a/man/sparsepp-package.Rd
+++ b/man/sparsepp-package.Rd
@@ -54,4 +54,22 @@ unlink(f)
 word_count(sample(letters, 100, T))
 }
 }
+\seealso{
+Useful links:
+\itemize{
+  \item \url{https://github.com/greg7mdp/sparsepp}
+  \item \url{https://github.com/dselivanov/r-sparsepp}
+  \item Report bugs at \url{https://github.com/dselivanov/r-sparsepp/issues}
+}
+
+}
+\author{
+\strong{Maintainer}: Dmitriy Selivanov \email{selivanov.dmitriy@gmail.com}
 
+Authors:
+\itemize{
+  \item Gregory Popovitch \email{greg7mdp@gmail.com} [copyright holder]
+  \item Google Inc [copyright holder]
+}
+
+}