diff --git a/picdoc/picdoc.fs b/picdoc/picdoc.fs
index cc1c8ab..ea24831 100644
--- a/picdoc/picdoc.fs
+++ b/picdoc/picdoc.fs
@@ -5,6 +5,7 @@ module picdoc =
     #r "../packages/MetadataExtractor/lib/net45/MetadataExtractor.dll"
     #r "../packages/XmpCore/lib/net35/XmpCore.dll"
     #r "../packages/Nustache/lib/net20/Nustache.Core.dll"
+    #r "../packages/Argu/lib/net40/Argu.dll"
     #endif
 
     open System
@@ -20,6 +21,8 @@ module picdoc =
         | [<MainCommand; ExactlyOnce>] InputDir of path:string
         | [<AltCommandLine("-p")>] FilePattern of pattern:string
         | [<AltCommandLine("-l")>] LinkPrefix of prefix:string
+        | Debug of debug : bool
+        | Pause of pause:bool
     with
         interface IArgParserTemplate with
             member s.Usage =
@@ -27,6 +30,7 @@ module picdoc =
                 | InputDir _ -> "input directory"
                 | FilePattern _ -> "pattern of files to be included"
                 | LinkPrefix _ -> "string to prefix the link to the images"
+                | _ -> ""
 
     [<EntryPoint>]
     let main argv =
@@ -36,6 +40,12 @@ module picdoc =
         let targetDir = opts.GetResult(<@ InputDir @>) |> Path.GetFullPath
         let filePattern = opts.GetResult(<@ FilePattern @>, defaultValue="*")
         let prefix = opts.GetResult(<@ LinkPrefix @>, defaultValue="")
+        let debug = opts.GetResult(<@ Debug @>, defaultValue=false)
+        let pause = opts.GetResult(<@ Pause @>, defaultValue=false)
+
+        if pause then 
+            printfn "Press any key to continue..."
+            System.Console.Read() |> ignore
 
         let infos = 
             System.IO.Directory.GetFiles(targetDir)
@@ -46,6 +56,10 @@ module picdoc =
                 >> Manipulator.fromExtractor Extractor.Title
                 >> Manipulator.fromExtractor Extractor.Description)
         
+        if debug then 
+            printfn "%A" infos
+            printfn "%A" System.Console.OutputEncoding
+        
         let rendered = Markdown.render infos // render
 
         printfn "%s" rendered
diff --git a/picdoc/renderer.fs b/picdoc/renderer.fs
index 14502c9..6985a18 100644
--- a/picdoc/renderer.fs
+++ b/picdoc/renderer.fs
@@ -9,14 +9,14 @@ module renderer =
 
         let template = """
     {{#images}}
-    ![{{title}}]({{path}})
+    ![{{& title}}]({{& path}})
 
     {{#title}}
-    **{{title}}**
+    **{{& title}}**
 
     {{/title}}
     {{#description}}
-    {{description}}
+    {{& description}}
 
     {{/description}}
     {{/images}}