diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..5d5da7f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 – 2016 Alvin Zhu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 5564f48..623dc6f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,29 @@
 # Thor
+
+Open the right application ASAP.
+
+![Screenshots](./screenshot_list.png)
+
+Thor is an OS X application that allows you to open other application immediately just by a shortcut. Feel free to enjoy the increased efficiency.
+
+![Screenshots](./screenshot_settings.png)
+
+## Build from source
+
+Thor uses [Cocoapods](https://cocoapods.org/) as dependency manager, follow the instructions below to build all dependencies.
+
+```
+git clone https://github.com/gbammc/Thor.git
+cd /path/to/Thor
+pod install
+```
+
+## Download
+
+[Click here to download the latest release.]()
+
+## Thanks
+
+I love the UI of [Pomodoro One](http://rinik.net/pomodoro/) !
+
+
diff --git a/Thor/AppDelegate.swift b/Thor/AppDelegate.swift
index c548877..57b4cf4 100644
--- a/Thor/AppDelegate.swift
+++ b/Thor/AppDelegate.swift
@@ -26,7 +26,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     var anewShortcutTimer: NSTimer?
     var delayTimer: NSTimer?
     
-    var statusItem: NSStatusItem = NSStatusBar.systemStatusBar().statusItemWithLength(NSVariableStatusItemLength)
+    var statusItem = NSStatusBar.systemStatusBar().statusItemWithLength(NSVariableStatusItemLength)
     
     // MARK: Life cycle
     
diff --git a/Thor/ShortcutListViewController.swift b/Thor/ShortcutListViewController.swift
index 1689b28..1609764 100644
--- a/Thor/ShortcutListViewController.swift
+++ b/Thor/ShortcutListViewController.swift
@@ -43,6 +43,8 @@ class ShortcutListViewController: NSViewController {
     }
     
     @IBAction func remove(sender: AnyObject) {
+        guard tableView.selectedRow != -1 else { return }
+        
         let alert = NSAlert()
         alert.addButtonWithTitle("Sure".localized())
         alert.addButtonWithTitle("Cancel".localized())
diff --git a/screenshot_list.png b/screenshot_list.png
new file mode 100644
index 0000000..0ac9854
Binary files /dev/null and b/screenshot_list.png differ
diff --git a/screenshot_settings.png b/screenshot_settings.png
new file mode 100644
index 0000000..699856d
Binary files /dev/null and b/screenshot_settings.png differ