diff --git a/CHANGELOG.md b/CHANGELOG.md
index de12b24cb..7e4e799af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,18 +25,28 @@ Table of Contents
 
 ### Breaking Changes
 
-* The default of how screenshots are created has changed from full page to viewport only. These two options are now available to set globally via properties and per test individually via `RecheckWebOptions`.
-
 ### Bug Fixes
 
 ### New Features
 
-* Screenshot creation can now be configured via the `RecheckOptions` or globally via `de.retest.recheck.web.screenshot.provider`. 
-
 ### Improvements
 
 * `AutocheckingRecheckDriver` and thus the `RecheckDriver` now implement the `RecheckLifecycle`, meaning that they can be used with the JUnit extensions.
 
+--------------------------------------------------------------------------------
+
+
+[1.7.0] (2019-11-21)
+--------------------
+
+### Breaking Changes
+
+* The default of how screenshots are created has changed from full page to viewport only. These two options are now available to set globally via properties and per test individually via `RecheckWebOptions`.
+
+### New Features
+
+* Screenshot creation can now be configured via the `RecheckOptions` or globally via `de.retest.recheck.web.screenshot.provider`. 
+
 
 --------------------------------------------------------------------------------
 
diff --git a/README.md b/README.md
index a086381ff..3318c7d6d 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,7 @@ You can open the `report` using [***review***](https://retest.de/review/) or the
 
 ### recheck-web seems to be slow when executing. What can I do about that?
 
-recheck-web itself is not slow. But screenshot creation is. We are currently working on that. In the next release, per default the screenshot will be created without scrolling. And you will have an option to turn screenshots off completely. Lucky enough, we only use the screenshot for documentation, not for the actual comparison.  
+recheck-web itself is not slow. But screenshot creation is. Lucky enough, we only use the screenshot for documentation, not for the actual comparison. Per default, we only create a screenshot of the given viewport and you can also disable the screenshot creation completely. For more information, please refer to our [documentation](https://docs.retest.de/recheck-web/usage/configuration/).
 
 
 ### What does the recheck warning mean?
diff --git a/pom.xml b/pom.xml
index 5418f1344..31868fbae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>de.retest</groupId>
 	<artifactId>recheck-web</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.8.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>recheck - web</name>
@@ -78,7 +78,7 @@
 		<dependency>
 			<groupId>de.retest</groupId>
 			<artifactId>recheck</artifactId>
-			<version>1.6.0</version>
+			<version>1.7.0</version>
 		</dependency>
 
 		<dependency>
@@ -152,14 +152,14 @@
 		<dependency>
 			<groupId>de.retest</groupId>
 			<artifactId>recheck-junit-jupiter-extension</artifactId>
-			<version>1.6.0</version>
+			<version>1.7.0</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>de.retest</groupId>
 			<artifactId>recheck-junit-4-extension</artifactId>
-			<version>1.6.0</version>
+			<version>1.7.0</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/src/test/java/de/retest/web/it/WikipediaIT.java b/src/test/java/de/retest/web/it/WikipediaIT.java
index 96bbd0e72..7250c5632 100644
--- a/src/test/java/de/retest/web/it/WikipediaIT.java
+++ b/src/test/java/de/retest/web/it/WikipediaIT.java
@@ -28,7 +28,6 @@ void setUp() throws Exception {
 
 	@Test
 	void myWikipediaTest() throws Exception {
-		re.startTest();
 		// Switch to "expected" subfolder to restore original page.
 		driver.get( PageFactory.toPageUrlString( "wikipedia/actual/wikipedia-characterization-test.html" ) );
 		re.check( driver, "characterization-testing-page" );
diff --git a/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/retest.xml b/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/retest.xml
index b2f9cbd0b..89ec4591a 100644
--- a/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/retest.xml
+++ b/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/retest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<reTestXmlDataContainer xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" reTestVersion="1.6.0" dataType="de.retest.recheck.ui.descriptors.SutState" dataTypeVersion="4">
+<reTestXmlDataContainer xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" reTestVersion="1.7.0-beta.2" dataType="de.retest.recheck.ui.descriptors.SutState" dataTypeVersion="4">
 	<data xsi:type="sutState">
 		<descriptors retestId="html" screenId="1" screen="Characterization test - Wikipedia" title="Characterization test - Wikipedia">
 			<identifyingAttributes>
@@ -3219,7 +3219,7 @@
 														<height>21</height>
 														<width>103</width>
 													</attribute>
-													<attribute key="class" xsi:type="stringAttribute">toclevel-1 tocsection-1</attribute>
+													<attribute key="class" xsi:type="stringAttribute">toclevel-1 tocsection-2</attribute>
 													<attribute key="outline" xsi:type="outlineAttribute">
 														<x>0</x>
 														<y>22</y>
@@ -3250,13 +3250,13 @@
 															<x>209</x>
 															<y>313</y>
 															<height>15</height>
-															<width>71</width>
+															<width>86</width>
 														</attribute>
 														<attribute key="outline" xsi:type="outlineAttribute">
 															<x>0</x>
 															<y>3</y>
 															<height>-6</height>
-															<width>-32</width>
+															<width>-17</width>
 														</attribute>
 														<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[2]/a[1]</attribute>
 														<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
@@ -3295,7 +3295,7 @@
 														</entry>
 														<entry>
 															<key>href</key>
-															<value xsi:type="xsd:string">#Overview</value>
+															<value xsi:type="xsd:string">#Advantages</value>
 														</entry>
 														<entry>
 															<key>outline-color</key>
@@ -3311,14 +3311,14 @@
 														</entry>
 													</attributes>
 												</attributes>
-												<containedElements retestId="overview">
+												<containedElements retestId="advantages">
 													<identifyingAttributes>
 														<attributes>
 															<attribute key="absolute-outline" xsi:type="outlineAttribute">
 																<x>224</x>
 																<y>310</y>
 																<height>21</height>
-																<width>56</width>
+																<width>71</width>
 															</attribute>
 															<attribute key="class" xsi:type="stringAttribute">toctext</attribute>
 															<attribute key="outline" xsi:type="outlineAttribute">
@@ -3329,7 +3329,7 @@
 															</attribute>
 															<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[2]/a[1]/span[2]</attribute>
 															<attribute key="suffix" xsi:type="suffixAttribute">2</attribute>
-															<attribute key="text" xsi:type="textAttribute">Overview</attribute>
+															<attribute key="text" xsi:type="textAttribute">Advantages</attribute>
 															<attribute key="type" xsi:type="stringAttribute">span</attribute>
 														</attributes>
 													</identifyingAttributes>
@@ -3346,7 +3346,7 @@
 														</attributes>
 													</attributes>
 												</containedElements>
-												<containedElements retestId="1">
+												<containedElements retestId="2">
 													<identifyingAttributes>
 														<attributes>
 															<attribute key="absolute-outline" xsi:type="outlineAttribute">
@@ -3360,11 +3360,11 @@
 																<x>0</x>
 																<y>-3</y>
 																<height>6</height>
-																<width>-56</width>
+																<width>-71</width>
 															</attribute>
 															<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[2]/a[1]/span[1]</attribute>
 															<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
-															<attribute key="text" xsi:type="textAttribute">1</attribute>
+															<attribute key="text" xsi:type="textAttribute">2</attribute>
 															<attribute key="type" xsi:type="stringAttribute">span</attribute>
 														</attributes>
 													</identifyingAttributes>
@@ -3645,7 +3645,7 @@
 														<height>21</height>
 														<width>103</width>
 													</attribute>
-													<attribute key="class" xsi:type="stringAttribute">toclevel-1 tocsection-2</attribute>
+													<attribute key="class" xsi:type="stringAttribute">toclevel-1 tocsection-1</attribute>
 													<attribute key="outline" xsi:type="outlineAttribute">
 														<x>0</x>
 														<y>0</y>
@@ -3676,13 +3676,13 @@
 															<x>209</x>
 															<y>291</y>
 															<height>15</height>
-															<width>86</width>
+															<width>71</width>
 														</attribute>
 														<attribute key="outline" xsi:type="outlineAttribute">
 															<x>0</x>
 															<y>3</y>
 															<height>-6</height>
-															<width>-17</width>
+															<width>-32</width>
 														</attribute>
 														<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[1]/a[1]</attribute>
 														<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
@@ -3721,7 +3721,7 @@
 														</entry>
 														<entry>
 															<key>href</key>
-															<value xsi:type="xsd:string">#Advantages</value>
+															<value xsi:type="xsd:string">#Overview</value>
 														</entry>
 														<entry>
 															<key>outline-color</key>
@@ -3737,14 +3737,14 @@
 														</entry>
 													</attributes>
 												</attributes>
-												<containedElements retestId="advantages">
+												<containedElements retestId="overview">
 													<identifyingAttributes>
 														<attributes>
 															<attribute key="absolute-outline" xsi:type="outlineAttribute">
 																<x>224</x>
 																<y>288</y>
 																<height>21</height>
-																<width>71</width>
+																<width>56</width>
 															</attribute>
 															<attribute key="class" xsi:type="stringAttribute">toctext</attribute>
 															<attribute key="outline" xsi:type="outlineAttribute">
@@ -3755,7 +3755,7 @@
 															</attribute>
 															<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[1]/a[1]/span[2]</attribute>
 															<attribute key="suffix" xsi:type="suffixAttribute">2</attribute>
-															<attribute key="text" xsi:type="textAttribute">Advantages</attribute>
+															<attribute key="text" xsi:type="textAttribute">Overview</attribute>
 															<attribute key="type" xsi:type="stringAttribute">span</attribute>
 														</attributes>
 													</identifyingAttributes>
@@ -3772,7 +3772,7 @@
 														</attributes>
 													</attributes>
 												</containedElements>
-												<containedElements retestId="2">
+												<containedElements retestId="1">
 													<identifyingAttributes>
 														<attributes>
 															<attribute key="absolute-outline" xsi:type="outlineAttribute">
@@ -3786,11 +3786,11 @@
 																<x>0</x>
 																<y>-3</y>
 																<height>6</height>
-																<width>-71</width>
+																<width>-56</width>
 															</attribute>
 															<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/div[2]/ul[1]/li[1]/a[1]/span[1]</attribute>
 															<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
-															<attribute key="text" xsi:type="textAttribute">2</attribute>
+															<attribute key="text" xsi:type="textAttribute">1</attribute>
 															<attribute key="type" xsi:type="stringAttribute">span</attribute>
 														</attributes>
 													</identifyingAttributes>
@@ -6084,6 +6084,36 @@
 											</attributes>
 										</containedElements>
 									</containedElements>
+									<containedElements retestId="actual">
+										<identifyingAttributes>
+											<attributes>
+												<attribute key="absolute-outline" xsi:type="outlineAttribute">
+													<x>314</x>
+													<y>207</y>
+													<height>16</height>
+													<width>40</width>
+												</attribute>
+												<attribute key="outline" xsi:type="outlineAttribute">
+													<x>113</x>
+													<y>25</y>
+													<height>-50</height>
+													<width>-920</width>
+												</attribute>
+												<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/p[1]/b[3]</attribute>
+												<attribute key="suffix" xsi:type="suffixAttribute">3</attribute>
+												<attribute key="text" xsi:type="textAttribute">actual</attribute>
+												<attribute key="type" xsi:type="stringAttribute">b</attribute>
+											</attributes>
+										</identifyingAttributes>
+										<attributes>
+											<attributes>
+												<entry>
+													<key>shown</key>
+													<value xsi:type="xsd:string">true</value>
+												</entry>
+											</attributes>
+										</attributes>
+									</containedElements>
 									<containedElements retestId="also_known_as">
 										<identifyingAttributes>
 											<attributes>
@@ -6121,7 +6151,7 @@
 										<identifyingAttributes>
 											<attributes>
 												<attribute key="absolute-outline" xsi:type="outlineAttribute">
-													<x>757</x>
+													<x>768</x>
 													<y>181</y>
 													<height>14</height>
 													<width>12</width>
@@ -6129,7 +6159,7 @@
 												<attribute key="class" xsi:type="stringAttribute">reference</attribute>
 												<attribute key="id" xsi:type="stringAttribute">cite_ref-1</attribute>
 												<attribute key="outline" xsi:type="outlineAttribute">
-													<x>556</x>
+													<x>567</x>
 													<y>-1</y>
 													<height>-52</height>
 													<width>-948</width>
@@ -6171,7 +6201,7 @@
 											<identifyingAttributes>
 												<attributes>
 													<attribute key="absolute-outline" xsi:type="outlineAttribute">
-														<x>757</x>
+														<x>768</x>
 														<y>181</y>
 														<height>14</height>
 														<width>12</width>
@@ -6423,7 +6453,7 @@
 												</entry>
 												<entry>
 													<key>href</key>
-													<value xsi:type="xsd:string">broken link</value>
+													<value xsi:type="xsd:string">https://en.wikipedia.org/wiki/Computer_programming</value>
 												</entry>
 												<entry>
 													<key>outline-color</key>
@@ -6510,24 +6540,24 @@
 											</attributes>
 										</attributes>
 									</containedElements>
-									<containedElements retestId="golden_master-2">
+									<containedElements retestId="characterization-1">
 										<identifyingAttributes>
 											<attributes>
 												<attribute key="absolute-outline" xsi:type="outlineAttribute">
-													<x>607</x>
+													<x>381</x>
 													<y>185</y>
 													<height>16</height>
-													<width>150</width>
+													<width>136</width>
 												</attribute>
 												<attribute key="outline" xsi:type="outlineAttribute">
-													<x>406</x>
+													<x>180</x>
 													<y>3</y>
 													<height>-50</height>
-													<width>-810</width>
+													<width>-824</width>
 												</attribute>
 												<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/p[1]/b[1]</attribute>
 												<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
-												<attribute key="text" xsi:type="textAttribute">Golden Master Testing</attribute>
+												<attribute key="text" xsi:type="textAttribute">characterization test</attribute>
 												<attribute key="type" xsi:type="stringAttribute">b</attribute>
 											</attributes>
 										</identifyingAttributes>
@@ -6540,24 +6570,24 @@
 											</attributes>
 										</attributes>
 									</containedElements>
-									<containedElements retestId="actual">
+									<containedElements retestId="golden_master-2">
 										<identifyingAttributes>
 											<attributes>
 												<attribute key="absolute-outline" xsi:type="outlineAttribute">
-													<x>314</x>
-													<y>207</y>
+													<x>618</x>
+													<y>185</y>
 													<height>16</height>
-													<width>40</width>
+													<width>150</width>
 												</attribute>
 												<attribute key="outline" xsi:type="outlineAttribute">
-													<x>113</x>
-													<y>25</y>
+													<x>417</x>
+													<y>3</y>
 													<height>-50</height>
-													<width>-920</width>
+													<width>-810</width>
 												</attribute>
 												<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/p[1]/b[2]</attribute>
 												<attribute key="suffix" xsi:type="suffixAttribute">2</attribute>
-												<attribute key="text" xsi:type="textAttribute">actual</attribute>
+												<attribute key="text" xsi:type="textAttribute">Golden Master Testing</attribute>
 												<attribute key="type" xsi:type="stringAttribute">b</attribute>
 											</attributes>
 										</identifyingAttributes>
@@ -6719,36 +6749,6 @@
 											</attributes>
 										</attributes>
 									</containedElements>
-									<containedElements retestId="characterization-1">
-										<identifyingAttributes>
-											<attributes>
-												<attribute key="absolute-outline" xsi:type="outlineAttribute">
-													<x>381</x>
-													<y>185</y>
-													<height>16</height>
-													<width>125</width>
-												</attribute>
-												<attribute key="outline" xsi:type="outlineAttribute">
-													<x>180</x>
-													<y>3</y>
-													<height>-50</height>
-													<width>-835</width>
-												</attribute>
-												<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/div[3]/div[4]/div[1]/p[1]/em[1]</attribute>
-												<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
-												<attribute key="text" xsi:type="textAttribute">characterization test</attribute>
-												<attribute key="type" xsi:type="stringAttribute">em</attribute>
-											</attributes>
-										</identifyingAttributes>
-										<attributes>
-											<attributes>
-												<entry>
-													<key>shown</key>
-													<value xsi:type="xsd:string">true</value>
-												</entry>
-											</attributes>
-										</attributes>
-									</containedElements>
 								</containedElements>
 								<containedElements retestId="one_of_the_inte">
 									<identifyingAttributes>
@@ -11770,7 +11770,7 @@
 								</attribute>
 								<attribute key="path" xsi:type="pathAttribute">html[1]/body[1]/div[3]/h1[1]</attribute>
 								<attribute key="suffix" xsi:type="suffixAttribute">1</attribute>
-								<attribute key="text" xsi:type="textAttribute">Difference testing</attribute>
+								<attribute key="text" xsi:type="textAttribute">Characterization test</attribute>
 								<attribute key="type" xsi:type="stringAttribute">h1</attribute>
 							</attributes>
 						</identifyingAttributes>
diff --git a/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/screenshot/html.png b/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/screenshot/html.png
index fd550e941..3064818ae 100644
Binary files a/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/screenshot/html.png and b/src/test/resources/retest/recheck/de.retest.web.it.WikipediaIT/myWikipediaTest.characterization-testing-page.recheck/screenshot/html.png differ