diff --git a/hooks/pre-commit b/hooks/pre-commit
index 3e872d69..8007a3e2 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -94,6 +94,7 @@ find_command() {
 }
 
 DASH=$(find_command dash)
+PYDOCSTYLE=$(find_command pydocstyle)
 PYFLAKES=$(find_command pyflakes)
 PEP8=$(find_command pycodestyle pep8)
 RUBY=$(find_command ruby)
@@ -103,6 +104,9 @@ if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then
 	err "pyflakes tests failed!"
     fi
+    if ! $PYDOCSTYLE $PY_FILES $PY_TEST_FILES; then
+	err "pydocstyle tests failed!"
+    fi
 fi
 
 if [ "$PY_FILES" != "" ]; then
diff --git a/setup.py b/setup.py
index 065c1c28..72c592b2 100755
--- a/setup.py
+++ b/setup.py
@@ -10,15 +10,15 @@ from setuptools.command.install import install
 
 
 class VersionCheckCommand(Command):
-    """Make sure git tag and version match before uploading"""
+    """Make sure git tag and version match before uploading."""
 
     user_options = []
 
     def initialize_options(self):
-        """Abstract method that is required to be overwritten"""
+        """Abstract method that is required to be overwritten."""
 
     def finalize_options(self):
-        """Abstract method that is required to be overwritten"""
+        """Abstract method that is required to be overwritten."""
 
     def run(self):
         version = self.distribution.get_version()