diff --git a/README.md b/README.md
index 7bb5e46..4ead39e 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,27 @@ Muscheln und Schnecken des Museums für Naturkunde Berlin freistellen und neue B
 |master      | [![Build Status](https://travis-ci.com/snailsnap/mosaic.svg?branch=master)](https://travis-ci.com/snailsnap/mosaic) | [![Build status](https://ci.appveyor.com/api/projects/status/5g1x1yk1wvlohao2/branch/master?svg=true)](https://ci.appveyor.com/project/lukaswagner/mosaic/branch/master) |
 |develop     | [![Build Status](https://travis-ci.com/snailsnap/mosaic.svg?branch=develop)](https://travis-ci.com/snailsnap/mosaic) | [![Build status](https://ci.appveyor.com/api/projects/status/5g1x1yk1wvlohao2/branch/develop?svg=true)](https://ci.appveyor.com/project/lukaswagner/mosaic/branch/develop) |
 
+## How to Run
+
+  - Install Qt
+  - Clone it
+  - Initialize submodules (if SmtpClient or JCVoronoi fail to build, you're missing this)
+  - Run CMake
+  - Build it
+  - Place the data folder (containing the snail images, the meta file and the optional descriptions) next to the built executable
+  - Run it
+  - If it doesn't work for some reason, check these steps again, and if it still doesn't work create an issue where you tell [Lukas](https://github.com/lukaswagner) to improve the readme.
+
+## Command Line Arguments
+
+  - Important
+    - `-n` or `--maxNumOfMolluscs` - Number of snails to build the mosaic from. A good value is 7500.
+  - Optional
+    - `-d` or `--data` - Path to the data folder, if it's not placed directly next to the executable.
+    - `-c` or `--useCam` - Whether the camera should be used to capture images. Pass `false` to use a file dialog to open an existing image. Default is `true`.
+  - Unnecessary
+    - `-o` or `--output` - Output of the processed image. Just for debugging.
+
 ## Dependencies
 
   - [Qt](https://www.qt.io/)
diff --git a/src/mail.cpp b/src/mail.cpp
index 012b072..ef9f143 100644
--- a/src/mail.cpp
+++ b/src/mail.cpp
@@ -67,8 +67,8 @@ void MailClient::sendImage(const QString& recipient, const QImage& image)
     auto text = new MimeText { m_message };
     mail.addPart(text);
 
-    image.save("SnailSnap.png");
-    auto file = new QFile { "SnailSnap.png" };
+    image.save("SnailSnap.jpg");
+    auto file = new QFile { "SnailSnap.jpg" };
     auto attachment = new MimeAttachment(file);
 
     mail.addPart(attachment);
diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
index cbf0f6a..a1afa83 100644
--- a/src/mainwindow.hpp
+++ b/src/mainwindow.hpp
@@ -50,7 +50,7 @@ class MainWindow : public QMainWindow {
 
 private:
     const int c_diaTime = 5000;
-    const int c_photoTime = 30000;
+    const int c_photoTime = 300000;
 
     bool m_imageCaptureInProgress = false;
     int m_countdown = -1;
diff --git a/src/mollusc.cpp b/src/mollusc.cpp
index a62a8af..d6f6473 100644
--- a/src/mollusc.cpp
+++ b/src/mollusc.cpp
@@ -43,7 +43,7 @@ Mollusc::Mollusc(const std::string& data)
     {
         strings.push_back(string);
     }
-    assert(strings.size() == 17 || strings.size() == 18);
+    assert(strings.size() > 16);
 
     auto i = 0u;
     m_imageName = strings[0];