diff --git a/DESCRIPTION b/DESCRIPTION
index ec3fb82..0296123 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: largeVis
 Type: Package
 Title: High-Quality Visualizations of Large, High-Dimensional Datasets
-Version: 0.2.1
+Version: 0.2.2
 Author: Amos B. Elberg
 Maintainer: Amos Elberg <amos.elberg@gmail.com>
 Description: Implements the largeVis algorithm (see Tang, et al. (2016)  <DOI:10.1145/2872427.2883041>) for visualizing very large high-dimensional datasets. Also very fast search for approximate nearest neighbors; outlier detection; and optimized implementations of the HDBSCAN*, DBSCAN and OPTICS clustering algorithms; plotting functions for visualizing the above.
@@ -26,4 +26,4 @@ BugReports: https://github.com/elbamos/largeVis/issues
 NeedsCompilation: yes
 BuildVignettes: TRUE
 VignetteBuilder: knitr
-SystemRequirements: C++11
+SystemRequirements: C++11, GNU make
diff --git a/NEWS.md b/NEWS.md
index dc750fd..0aa11e0 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,7 @@
-### largeVis 0.2.0.1
+### largeVis 0.2.2dev
+*	Modified Makevars should now automatically handle OpenMP correctly on OS X with R 3.4.
+
+### largeVis 0.2.1
 * Fix for a bug in which the edgeMatrix needed to be transposed in some circumstances.
 * Accepted a PR related to a bug where `largeVis` would fail if saveNeighbors was set to FALSE.
 * Fixed a documentation error.
diff --git a/cran-comments.md b/cran-comments.md
deleted file mode 100644
index c3d3be8..0000000
--- a/cran-comments.md
+++ /dev/null
@@ -1,25 +0,0 @@
-## Submission 
- 
-This is a resubmission of a bug-fix update, to 0.2.1.
-After the first submission, it was requested that I change a URL in the DESCRIPTION file to a DOI.  I have done this.
- 
-## Test environments 
-* local OS X install, R 3.4
-* OS X (with Valgrind), R 3.4
-* ubuntu 14.04 (on travis-ci), R 3.4 and R-devel 
-* OS X (on travis-ci), R-devel 
-* win-builder (devel and release) 
- 
-## R CMD check results 
- 
-0 errors | 0 warnings | 2 notes 
- 
-* The Notes concern installation size, and a false-alarm regarding misspelled words.
- 
-## Note regarding test errors 
- 
-The submission dialog asks me to confirm that CI errors have been fixed. This submission does not address errors related to Solaris.  The Solaris errors appear to be related to Solaris Studio, and I have not been able to reproduce it using gcc on Solaris.  
- 
-## Reverse dependencies 
- 
-There are no reverse dependencies reported on CRAN. 
\ No newline at end of file
diff --git a/src/Makevars b/src/Makevars
index cccddab..bbe03c2 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,4 +1,12 @@
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
-PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_OPENMP_CFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
-PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DARMA_64BIT_WORD -DNDEBUG
-CXX_STD=CXX11
\ No newline at end of file
+CXX_STD=CXX11
+
+CXX1X=$(shell ${R_HOME}/bin/R CMD config CXX11)
+
+ifeq ($(shell $(CXX1X) -fopenmp -E -xc++ - 2>&1 >/dev/null && echo 'true'), true)
+  PKG_CFLAGS=$(SHLIB_OPENMP_CFLAGS)
+  PKG_LIBS=$(SHLIB_OPENMP_CXXFLAGS) $(SHLIB_OPENMP_CFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+  PKG_CXXFLAGS=$(SHLIB_OPENMP_CXXFLAGS) -DARMA_64BIT_WORD -DNDEBUG
+else
+  PKG_LIBS=$(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS)
+  PKG_CXXFLAGS=-DARMA_64BIT_WORD -DNDEBUG
+endif
\ No newline at end of file