diff --git a/XSVim.Tests/MarkerTests.fs b/XSVim.Tests/MarkerTests.fs
new file mode 100644
index 0000000..34d9eaf
--- /dev/null
+++ b/XSVim.Tests/MarkerTests.fs
@@ -0,0 +1,16 @@
+namespace XSVim.Tests
+open NUnit.Framework
+
+[<TestFixture>]
+module ``Marker tests`` =
+    [<Test>]
+    let ``ma adds marker a``() =
+        assertText "a$bc" "mall`a" "a$bc"
+
+    [<Test>]
+    let ``'a moves to start of line of marker a``() =
+        assertText "123 a$bc" "mall'a" "1$23 abc"
+
+    [<Test>]
+    let ``'. jumps to last edit line``() =
+        assertText "  123 a$bc" "i<esc>'." "  1$23 abc"
diff --git a/XSVim.Tests/MiscTests.fs b/XSVim.Tests/MiscTests.fs
index 6ec1e01..ebc3228 100644
--- a/XSVim.Tests/MiscTests.fs
+++ b/XSVim.Tests/MiscTests.fs
@@ -133,4 +133,4 @@ module ``Miscellaneous tests`` =
 
     [<Test>]
     let ``<C-x> decrements -1``() =
-        assertText "abc -1$ " "<C-x>" "abc -2$ "
\ No newline at end of file
+        assertText "abc -1$ " "<C-x>" "abc -2$ "
diff --git a/XSVim.Tests/XSVim.Tests.fsproj b/XSVim.Tests/XSVim.Tests.fsproj
index 7df08b9..9bd8372 100644
--- a/XSVim.Tests/XSVim.Tests.fsproj
+++ b/XSVim.Tests/XSVim.Tests.fsproj
@@ -79,6 +79,7 @@
 		<Compile Include="ChangeTests.fs" />
 		<Compile Include="InsertionTests.fs" />
 		<Compile Include="TextObjectSelectionTests.fs" />
+		<Compile Include="MarkerTests.fs" />
 	</ItemGroup>
 	<Import Project="$(FSharpTargetsPath)" />
 </Project>
\ No newline at end of file
diff --git a/XSVim/XSVim.fs b/XSVim/XSVim.fs
index 24a8d69..a155d9d 100755
--- a/XSVim/XSVim.fs
+++ b/XSVim/XSVim.fs
@@ -199,10 +199,11 @@ module VimHelpers =
     let findQuoteTriplet (editor:TextEditor) line quoteChar =
         let firstBackwards = findCharBackwardsOnLine editor.CaretOffset editor line ((=) quoteChar)
         let firstForwards = findCharForwardsOnLine editor line editor.CaretOffset (string quoteChar)
-        let secondForwards = match firstForwards with
-        | Some offset when offset + 1 < editor.Text.Length -> 
-            findCharForwardsOnLine editor line offset (string quoteChar)
-        | _ -> None
+        let secondForwards =
+            match firstForwards with
+            | Some offset when offset + 1 < editor.Text.Length -> 
+                findCharForwardsOnLine editor line offset (string quoteChar)
+            | _ -> None
         firstBackwards, firstForwards, secondForwards
 
     let getRange (vimState:VimState) (editor:TextEditor) (command:VimAction) =
@@ -403,7 +404,7 @@ module VimHelpers =
                 startOffset, editor.CaretOffset
             | _ -> editor.CaretOffset, editor.CaretOffset
         | ToMark mark ->
-            if IdeApp.Workbench.ActiveDocument.FileName.FullPath.ToString() = mark.FileName then
+            if editor.FileName.FullPath.ToString() = mark.FileName then
                 editor.CaretOffset, mark.Offset
             else 
                 let document = IdeApp.Workbench.GetDocument(mark.FileName)
@@ -746,7 +747,11 @@ module Vim =
                         setCaretMode vimState Block
 
                         vimState.undoGroup |> Option.iter(fun d -> d.Dispose())
-
+                        let vimState =
+                            if vimState.mode = InsertMode then
+                                processCommands 1 vimState (runOnce (SetMark ".") Nothing) false
+                            else
+                                vimState
                         { vimState with mode = mode; lastSelection = lastSelection; undoGroup = None; statusMessage = None }
                     | VisualMode | VisualLineMode | VisualBlockMode ->
                         setCaretMode vimState Block
@@ -1015,6 +1020,10 @@ module Vim =
                 match markDict.TryGetValue c with
                 | true, mark -> [ runOnce Move (ToMark mark)]
                 | _ -> [ run ResetKeys Nothing]
+            | NotInsertMode, [ "'"; c] -> 
+                match markDict.TryGetValue c with
+                | true, mark -> [ runOnce Move (ToMark mark); runOnce Move FirstNonWhitespace ]
+                | _ -> [ run ResetKeys Nothing]
             | NotInsertMode, [ Action action; FindChar m; c ] -> [ run action (m c) ]
             | NotInsertMode, [ Action action; "i"; BlockDelimiter c ] -> [ run action (InnerBlock c) ]
             | NotInsertMode, [ Action action; "a"; BlockDelimiter c ] -> [ run action (ABlock c) ]
@@ -1041,6 +1050,7 @@ module Vim =
             | NotInsertMode, [ "g" ] -> wait
             | NotInsertMode, [ "m" ] -> wait
             | NotInsertMode, [ "`" ] -> wait
+            | NotInsertMode, [ "'" ] -> wait
             | NotInsertMode, [ "g"; "g" ] ->
                 let lineNumber = match numericArgument with Some n -> n | None -> 1
                 [ runOnce Move (StartOfLineNumber lineNumber) ]