diff --git a/reader.lua b/reader.lua
index 0d49706d5..06dc40722 100644
--- a/reader.lua
+++ b/reader.lua
@@ -1,11 +1,15 @@
+#!./kpdfview
+
 package.path = "./frontend/?.lua"
 require "ui/ui"
 require "ui/readerui"
 require "ui/filechooser"
 require "ui/infomessage"
 require "document/document"
+require "alt_getopt"
+
 
-function showReader(file)
+function showReader(file, pass)
 	local document = DocumentRegistry:getProvider(file)
 	if not document then
 		UIManager:show(InfoMessage:new{ text = "No reader engine for this file" })
@@ -22,8 +26,10 @@ function showReader(file)
 	local reader = ReaderUI:new{
 		dialog = readerwindow,
 		dimen = Screen:getSize(),
-		document = document
+		document = document,
+		password = pass
 	}
+
 	readerwindow[1] = reader
 
 	UIManager:show(readerwindow)
@@ -49,6 +55,78 @@ function showFileManager(path)
 	UIManager:show(FileManager)
 end
 
-showFileManager(".")
 
-UIManager:run()
+
+-- option parsing:
+longopts = {
+	password = "p",
+	goto = "g",
+	gamma = "G",
+	debug = "d",
+	help = "h"
+}
+
+function showusage()
+	print("usage: ./reader.lua [OPTION] ... path")
+	print("Read all the books on your E-Ink reader")
+	print("")
+	print("-p, --password=PASSWORD   set password for reading PDF document")
+	print("-G, --gamma=GAMMA         set gamma correction")
+	print("                          (floating point notation, e.g. \"1.5\")")
+	print("-d, --debug               start in debug mode")
+	print("-h, --help                show this usage help")
+	print("")
+	print("If you give the name of a directory instead of a file path, a file")
+	print("chooser will show up and let you select a file")
+	print("")
+	print("If you don't pass any path, the last viewed document will be opened")
+	print("")
+	print("This software is licensed under the GPLv3.")
+	print("See http://github.com/hwhw/kindlepdfviewer for more info.")
+	return
+end
+
+optarg, optind = alt_getopt.get_opts(ARGV, "p:G:hg:dg:", longopts)
+
+if optarg["h"] then
+	return showusage()
+end
+
+if not optarg["d"] then
+	DEBUG = function() end
+end
+
+if optarg["G"] ~= nil then
+	globalgamma = optarg["G"]
+end
+
+Screen:updateRotationMode()
+Screen.native_rotation_mode = Screen.cur_rotation_mode
+
+
+
+if ARGV[optind] then
+	if lfs.attributes(ARGV[optind], "mode") == "directory" then
+		showFileManager(ARGV[optind])
+	elseif lfs.attributes(ARGV[optind], "mode") == "file" then
+		showReader(ARGV[optind], optarg["p"])
+	end
+	UIManager:run()
+elseif last_file and lfs.attributes(last_file, "mode") == "file" then
+	--@TODO get last_file from settings  12.06 2012 (houqp)
+	showReader(last_file, optarg["p"])
+	UIManager:run()
+else
+	return showusage()
+end
+
+
+
+-- @TODO dirty workaround, find a way to force native system poll
+-- screen orientation and upside down mode 09.03 2012
+fb:setOrientation(Screen.native_rotation_mode)
+
+if util.isEmulated()==0 then
+	os.execute("killall -cont cvm")
+	os.execute('echo "send '..KEY_MENU..'" > /proc/keypad;echo "send '..KEY_MENU..'" > /proc/keypad')
+end