diff --git a/README.md b/README.md
index 2d20f7de..4a99d22a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ![image](./img/flameshot.png)
 > Powerfull yet simple to use screenshot software.
 
-**This program is in heavy develpment and it's incomplete!**
+**A beta will be released and packaged for the main GNU/Linux distros soon !**
 
 ## Usage
 
diff --git a/docs/build.md b/docs/build.md
new file mode 100644
index 00000000..a5a18a56
--- /dev/null
+++ b/docs/build.md
@@ -0,0 +1 @@
+# Building From Source 
diff --git a/docs/qsettings.md b/docs/dev/qsettings.md
similarity index 100%
rename from docs/qsettings.md
rename to docs/dev/qsettings.md
diff --git a/docs/futureFeatures.md b/docs/futureFeatures.md
new file mode 100644
index 00000000..78c672c6
--- /dev/null
+++ b/docs/futureFeatures.md
@@ -0,0 +1,10 @@
+ This will gather some possible features to implement in Flameshot.
+These are just conceptual and they may not be implemented implemented in a short period of time.
+
+- Add Text Button: this could be very handy but requires a huge refactor of the source code.
+
+- Mouse Visibility Button: if you look at the source code you'll find a lot of references about this. In fact it is almost implemente but it is disabled because the most important part (the code that fetches the mouse icon) is plataform specific and it requieres some of my time to end the implementation.
+
+- CLI tool: having a cli tool is very practical and it could be used in many different ways. Having a command line program will enable the posibility of using the system-wide shortcuts to activate the captures.
+
+- Video Recording Support: I don't know if this will happen but it could be interesting to have a unified tool and satisfy every need to capture your desktop. Requires a ton of investigation.
diff --git a/docs/user-manual/Flameshot-Manual.odt b/docs/user-manual/Flameshot-Manual.odt
new file mode 100644
index 00000000..cc520d3b
Binary files /dev/null and b/docs/user-manual/Flameshot-Manual.odt differ
diff --git a/docs/user-manual/userManual.md b/docs/user-manual/userManual.md
new file mode 100644
index 00000000..8d1c8b69
--- /dev/null
+++ b/docs/user-manual/userManual.md
@@ -0,0 +1 @@
+