diff --git a/.gitignore b/.gitignore
index 5411c96..6216e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+npm-debug.log
 package-lock.json
 node_modules
 platforms/
diff --git a/README.md b/README.md
index 0b13651..b4e3766 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ component screenshots at [nativescript-vue.org](https://nativescript-vue.org/).
 * The [Appium](http://appium.io/) client. Just download and install the latest [from GitHub](https://github.com/appium/appium-desktop/releases/latest).
 
 ## Running the tests locally
-Start Appium, or you'll receive an error `127.0.0.1` can't be reached.
+Start Appium and press 'Start the server', or you'll receive an error `127.0.0.1:4723` can't be reached.
 
 ### Android
 ```bash
diff --git a/app/app.css b/app/app.css
index 339b78b..6a733c3 100644
--- a/app/app.css
+++ b/app/app.css
@@ -2,6 +2,10 @@
     margin: 5;
 }
 
+.m-10 {
+    margin: 10;
+}
+
 .m-15 {
     margin: 15;
 }
diff --git a/app/app.js b/app/app.js
index 55e1440..8fba8ff 100644
--- a/app/app.js
+++ b/app/app.js
@@ -39,6 +39,10 @@ new Vue({
                 name: 'Progress',
                 component: () => require('./elements/components/Progress')
             },
+            {
+                name: 'ScrollView',
+                component: () => require('./elements/components/ScrollView')
+            },
             {
                 name: 'SearchBar',
                 component: () => require('./elements/components/SearchBar')
diff --git a/app/elements/components/ScrollView.js b/app/elements/components/ScrollView.js
new file mode 100644
index 0000000..500ee20
--- /dev/null
+++ b/app/elements/components/ScrollView.js
@@ -0,0 +1,48 @@
+module.exports = {
+    template: `
+        <GridLayout rows="auto, *">
+            <ScrollView row="0" orientation="horizontal">
+                <StackLayout orientation="horizontal">
+                    <Label text="h1" class="m-10" />
+                    <Label text="h2" class="m-10" />
+                    <Label text="h3" class="m-10" />
+                    <Label text="h4" class="m-10" />
+                    <Label text="h5" class="m-10" />
+                    <Label text="h6" class="m-10" />
+                    <Label text="h7" class="m-10" />
+                    <Label text="h8" class="m-10" />
+                    <Label text="h9" class="m-10" />
+                    <Label text="h10" class="m-10" />
+                    <Label text="h11" class="m-10" />
+                    <Label text="h12" class="m-10" />
+                </StackLayout>
+            </ScrollView>
+            <ScrollView row="1" horizontalAlignment="center">
+                <StackLayout>
+                    <Label text="v1" class="m-10" />
+                    <Label text="v2" class="m-10" />
+                    <Label text="v3" class="m-10" />
+                    <Label text="v4" class="m-10" />
+                    <Label text="v5" class="m-10" />
+                    <Label text="v6" class="m-10" />
+                    <Label text="v7" class="m-10" />
+                    <Label text="v8" class="m-10" />
+                    <Label text="v9" class="m-10" />
+                    <Label text="v10" class="m-10" />
+                    <Label text="v11" class="m-10" />
+                    <Label text="v12" class="m-10" />
+                    <Label text="v13" class="m-10" />
+                    <Label text="v14" class="m-10" />
+                    <Label text="v15" class="m-10" />
+                    <Label text="v16" class="m-10" />
+                    <Label text="v17" class="m-10" />
+                    <Label text="v18" class="m-10" />
+                    <Label text="v19" class="m-10" />
+                    <Label text="v20" class="m-10" />
+                    <Label text="v21" class="m-10" />
+                    <Label text="v22" class="m-10" />
+                </StackLayout>
+            </ScrollView>
+        </GridLayout>
+    `
+};
\ No newline at end of file
diff --git a/generate-screenshots.js b/generate-screenshots.js
index 0b3b2bf..50eb837 100644
--- a/generate-screenshots.js
+++ b/generate-screenshots.js
@@ -12,6 +12,7 @@ const components = [
     'ListPicker',
     'ListView',
     'Progress',
+    'ScrollView',
     'SearchBar',
     'SegmentedBar',
     'Slider',
diff --git a/package.json b/package.json
index 3c129a7..9025378 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "deploy": "bash deploy.sh",
     "e2e": "mocha --opts ./e2e/config/mocha.opts",
     "ios.build": "tns build ios",
-    "ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6 --sauceLab=true"
+    "ios.screenshots": "npm run appium -- --runType=ios-simulator103iPhone6"
   },
   "devDependencies": {
     "babel-traverse": "6.26.0",
diff --git a/screenshots/android23/ScrollView.png b/screenshots/android23/ScrollView.png
new file mode 100644
index 0000000..0c3ec9c
Binary files /dev/null and b/screenshots/android23/ScrollView.png differ
diff --git a/screenshots/ios-simulator103iPhone6/ScrollView.png b/screenshots/ios-simulator103iPhone6/ScrollView.png
new file mode 100644
index 0000000..4d43403
Binary files /dev/null and b/screenshots/ios-simulator103iPhone6/ScrollView.png differ