diff --git a/README.md b/README.md
index 53ced31a..72a0eedb 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,12 @@ Make sure to install these first.
 
 ---
 
+**Ubuntu 16.10**
+
+    sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qtdeclarative5-qtquick2-plugin libqt5qml-graphicaleffects qml-module-qtquick-dialogs qtdeclarative5-localstorage-plugin qtdeclarative5-window-plugin
+
+---
+
 **Debian Jessie**
 
     sudo apt-get install build-essential qmlscene qt5-qmake qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtgraphicaleffects qml-module-qtquick-dialogs qml-module-qtquick-localstorage qml-module-qtquick-window2
diff --git a/app/main.cpp b/app/main.cpp
index 0cf128f4..a49bedf6 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -48,6 +48,8 @@ int main(int argc, char *argv[])
     // Manage command line arguments from the cpp side
     QStringList args = app.arguments();
     if (args.contains("-h") || args.contains("--help")) {
+        // BUG: This usage help text goes to stderr, should go to stdout.
+        // BUG: First line of output is surrounded by double quotes.
         qDebug() << "Usage: " + args.at(0) + " [--default-settings] [--workdir <dir>] [--program <prog>] [-p|--profile <prof>] [--fullscreen] [-h|--help]";
         qDebug() << "  --default-settings  Run cool-retro-term with the default settings";
         qDebug() << "  --workdir <dir>     Change working directory to 'dir'";
@@ -59,6 +61,11 @@ int main(int argc, char *argv[])
         return 0;
     }
 
+    if (args.contains("-v") || args.contains("--version")) {
+        qDebug() << "cool-retro-term 1.0";
+	return 0;
+    }
+
     // Manage default command
     QStringList cmdList;
     if (args.contains("-e")) {
diff --git a/app/qml/Components/SizedLabel.qml b/app/qml/Components/SizedLabel.qml
index a3dbfeaf..23a38b6a 100644
--- a/app/qml/Components/SizedLabel.qml
+++ b/app/qml/Components/SizedLabel.qml
@@ -22,7 +22,7 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.0
 
-// This component is simply a label with a predifined size.
+// This component is simply a label with a predefined size.
 // Used to improve alignment.
 
 Item {