diff --git a/.pmd b/.pmd
new file mode 100644
index 00000000..558e82ea
--- /dev/null
+++ b/.pmd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+    <useProjectRuleSet>true</useProjectRuleSet>
+    <ruleSetFile>pmd-rules.xml</ruleSetFile>
+    <includeDerivedFiles>false</includeDerivedFiles>
+    <violationsAsErrors>true</violationsAsErrors>
+    <fullBuildEnabled>true</fullBuildEnabled>
+</pmd>
diff --git a/README.md b/README.md
index 2693236b..c29c57ef 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,14 @@ Parts of the code are well tested, whereas others are left untested intentionall
 
 We have developed and are using this code at a software testing course at Delft University of Technology, The Netherlands. Teachers interested in seeing the exercises I use there are invited to contact me.
 
-Other universities who have used this material include Antwerp, Eindhoven, and UBC (Vancouver).
+Other universities who have used this material include Antwerp, Mons, Eindhoven, and UBC (Vancouver).
+At TU Delft, we use it in combination with [DevHub](https://github.com/devhub-tud/devhub) as git, continuous integration, and feedback server.
 
-If you have any suggestions on how to improve this framework, please do not hesitate to contact us, open issue, or provide a pull request.
+If you have any suggestions on how to improve this framework, please do not hesitate to contact us, open issue, or provide a pull request. Since testing is deliberately left as an exercise, pull requests that "solve" exercises or offer full coverage are less likely to be merged.
 
 Main contributors:
 
-*	Arie van Deursen (versions 1.0-5.x, 2003-2013)
+*	Arie van Deursen (versions 1.0-5.x, 2003-2013, updates to versions 6.x and further, 2014-...)
 *	Jeroen Roosen (major rewrite, version 6.0, 2014)
 
 
diff --git a/pmd-rules.xml b/pmd-rules.xml
index a6b3167b..f8d304e6 100644
--- a/pmd-rules.xml
+++ b/pmd-rules.xml
@@ -1,39 +1,28 @@
 <?xml version="1.0"?>
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	name="Custom ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-	xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+         name="Custom ruleset"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
 
-	<description>
-        Custom set of rules for checking jpacman code quality.
+    <description>
+        Custom rules for checking JUnit test quality.
     </description>
 
-	<rule ref="rulesets/java/basic.xml" />
-	<rule ref="rulesets/java/design.xml">
-		<exclude name="UseVarargs" />
-	</rule>
-	<rule ref="rulesets/java/unusedcode.xml" />
-	<rule ref="rulesets/java/imports.xml" />
-	<rule ref="rulesets/java/imports.xml/TooManyStaticImports">
-		<properties>
-			<property name="maximumStaticImports" value="8" />
-		</properties>
-	</rule>
-	<rule ref="rulesets/java/strings.xml" />
-	<rule ref="rulesets/java/strings.xml/AvoidDuplicateLiterals">
-		<properties>
-			<property name="skipAnnotations" value="true" />
-		</properties>
-	</rule>
-	<rule ref="rulesets/java/codesize.xml" />
-	<rule ref="rulesets/java/braces.xml" />
-	<rule ref="rulesets/java/clone.xml" />
-	<rule ref="rulesets/java/empty.xml" />
-	<rule ref="rulesets/java/junit.xml">
-		<exclude name="JUnitAssertionsShouldIncludeMessage" />
-	</rule>
-	<rule ref="rulesets/java/junit.xml/JUnitTestContainsTooManyAsserts">
-		<properties>
-			<property name="maximumAsserts" value="4" />
-		</properties>
-	</rule>
+    <rule ref="rulesets/java/basic.xml"/>
+    <rule ref="rulesets/java/unusedcode.xml"/>
+    <rule ref="rulesets/java/imports.xml"/>
+    <rule ref="rulesets/java/strings.xml"/>
+    <rule ref="rulesets/java/codesize.xml"/>
+    <rule ref="rulesets/java/braces.xml"/>
+    <rule ref="rulesets/java/clone.xml"/>
+    <rule ref="rulesets/java/empty.xml"/>
+    <rule ref="rulesets/java/junit.xml">
+        <exclude name="JUnitAssertionsShouldIncludeMessage"/>
+	<exclude name="JUnitTestContainsTooManyAsserts" />
+    </rule>
+    <rule ref="rulesets/java/junit.xml/JUnitTestContainsTooManyAsserts">
+        <properties>
+            <property name="maximumAsserts" value="5" />
+        </properties>
+    </rule>
 </ruleset>
diff --git a/pom.xml b/pom.xml
index a711783a..84191093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>nl.tudelft.jpacman</groupId>
 	<artifactId>jpacman-framework</artifactId>
-	<version>6.3.0</version>
+	<version>6.4.0</version>
 	<url>https://github.com/serg-delft/jpacman-framework</url>
 	<description>
         Pacman-inspired game, for teaching testing purposes.