Merge branch 'master' into develop

1 files changed, 6 insertions, 4 deletions

diff --git a/README.md b/README.md
index 1d0c4655..75e656a6 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 QtPass
 ======
 
-QtPass is a gui for [pass](http://www.passwordstore.org/)
+QtPass is a GUI for [pass](http://www.passwordstore.org/)
 
 Features
 --------
 * Using pass or git and gpg2 directly
 * Configurable shoulder surfing protection options
 * Cross platform: Linux, BSD, OS X and Windows
-* Per-folder user selection for multi recepient encrypton
+* Per-folder user selection for multi recipient encryption
 
 While QtPass will work with Qt4, currently multi-line editing is restricted to Qt5 only.
 
@@ -16,6 +16,7 @@ Security considerations
 -----------------------
 Using this program will not magically keep your passwords secure against
 compromised computers even if you use it in combination with a smartcard.
+
 It does protect future and changed passwords though against anyone with access to
 your password store only but not your keys.
 Used with a smartcard it also protects against anyone just monitoring/copying
@@ -25,6 +26,7 @@ Once you plug in your smartcard and enter your PIN (or due to CVE-2015-3298
 even without your PIN) all your passwords available to the machine can be
 decrypted by it, if there is malicious software targeted specifically against
 it installed (or at least one that knows how to use a smartcard).
+
 To get better protection out of use with a smartcard even against a targeted
 attack I can think of at least two options:
 * The smartcard must require explicit confirmation for each decryption operation.
@@ -45,8 +47,8 @@ Planned features
 * Colour coding folders (possibly disabling folders you can't decrypt)
 * Optional table view of decrypted folder contents
 
-Instalation
------------
+Installation
+------------
 On most systems all you need is:
 `qmake && make && make install`