diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..8893f4c
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,141 @@
+# Contributing to this project
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The issue tracker is the preferred channel for [bug reports](#bugs),
+[features requests](#features) and [submitting pull
+requests](#pull-requests), but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [Our Umbraco](https://our.umbraco.org/projects/backoffice-extensions/nexu/) or Twitter).
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; create a reduced test case and a live example.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What browser(s) and OS
+experience the problem? What would you expect to be the outcome? All these
+details will help people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout a project (indentation,
+accurate comments, etc.) and any other requirements (such as test coverage).
+
+Follow this process if you'd like your work considered for inclusion in the
+project:
+
+1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/<repo-name>
+   # Navigate to the newly cloned directory
+   cd <repo-name>
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/<upstream-owner>/<repo-name>
+   ```
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout develop
+   git pull upstream develop
+   ```
+
+3. Create a new topic branch (off the main project `develop` branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream develop
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+    with a clear title and description.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
+license your work under the same license as that used by the project.
\ No newline at end of file
diff --git a/README.md b/README.md
index 35ade84..83417a4 100644
--- a/README.md
+++ b/README.md
@@ -21,4 +21,6 @@ The documentation for this package can be found [here](docs/index.md)
 
 ## Special thanks ##
 
-[Jeavon Leopold](https://twitter.com/crumpled_jeavon) for his help in setting up the build automation. Sorry for bugging you on Slack :-)
\ No newline at end of file
+[Jeavon Leopold](https://twitter.com/crumpled_jeavon) for his help in setting up the build automation. Sorry for bugging you on Slack :-)
+
+And of course all the [contributors](https://github.com/dawoe/umbraco-nexu/graphs/contributors)
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core.Tests/NexuApiControllerTests.cs b/Source/Our.Umbraco.Nexu.Core.Tests/NexuApiControllerTests.cs
index 578a248..98e3979 100644
--- a/Source/Our.Umbraco.Nexu.Core.Tests/NexuApiControllerTests.cs
+++ b/Source/Our.Umbraco.Nexu.Core.Tests/NexuApiControllerTests.cs
@@ -48,6 +48,11 @@ public class NexuApiControllerTests : BaseRoutingTest
         /// </summary>
         private Mock<IContentService> contentServiceMock;
 
+        /// <summary>
+        /// The media service.
+        /// </summary>
+        private Mock<IMediaService> mediaServiceMock;
+
         /// <summary>
         /// The controller.
         /// </summary>
@@ -106,6 +111,7 @@ public override void Initialize()
             this.nexuServiceMock = new Mock<INexuService>();
             this.mappingEngineMock = new Mock<IMappingEngine>();
             this.contentServiceMock = new Mock<IContentService>();
+            this.mediaServiceMock = new Mock<IMediaService>();
 
             // Mocked settings are now necessary
             SettingsForTests.ConfigureSettings(SettingsForTests.GenerateMockSettings());
@@ -126,7 +132,8 @@ public override void Initialize()
                                   this.UmbracoContext,
                                   this.nexuServiceMock.Object,
                                   this.mappingEngineMock.Object,
-                                  this.contentServiceMock.Object)
+                                  this.contentServiceMock.Object,
+                                  this.mediaServiceMock.Object)
             {
                 Request = new HttpRequestMessage
                 {
@@ -195,6 +202,445 @@ public void TestGetIncomingLinks()
             Assert.IsNotNull(model);
         }
 
+        /// <summary>
+        /// The check descendants for incoming links should return false when there are no children.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckContentDescendantsForIncomingLinksShouldReturnFalseWhenThereAreNoChildren()
+        {
+            // arrange
+            var contentId = 123;
+
+            var children = new List<IContent>();
+
+            this.contentServiceMock.Setup(x => x.GetChildren(contentId)).Returns(children);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckContentDescendantsForIncomingLinks(contentId);
+
+            // arrange
+            Assert.IsFalse(result);
+
+            this.contentServiceMock.Verify(x => x.GetChildren(contentId), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false), Times.Never);
+        }
+
+        /// <summary>
+        /// The check descendants for incoming links should return false when they have no incoming links.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckContentDescendantsForIncomingLinksShouldReturnFalseWhenTheyHaveNoIncomingLinks()
+        {
+            // arrange
+            var contentId = 123;
+
+            var children = new List<IContent>();
+
+            var child1 = new Mock<IContent>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IContent>();
+            child2.Setup(x => x.Id).Returns(789);
+
+            children.Add(child2.Object);
+
+            var descendants = new List<IContent>();
+
+            var descendant1 = new Mock<IContent>();
+            descendant1.Setup(x => x.Id).Returns(000);
+
+            this.contentServiceMock.Setup(x => x.GetChildren(contentId)).Returns(children);
+            this.contentServiceMock.Setup(x => x.GetChildren(child1.Object.Id)).Returns(new List<IContent>());
+            this.contentServiceMock.Setup(x => x.GetChildren(child2.Object.Id)).Returns(descendants);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckContentDescendantsForIncomingLinks(contentId);
+
+            // arrange
+            Assert.IsFalse(result);
+
+            this.contentServiceMock.Verify(x => x.GetChildren(contentId), Times.Once);
+            this.contentServiceMock.Verify(x => x.GetChildren(child1.Object.Id), Times.Once);
+            this.contentServiceMock.Verify(x => x.GetChildren(child2.Object.Id), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false), Times.Exactly(children.Count + descendants.Count));
+        }
+
+        /// <summary>
+        /// The check descendants for incoming links should return true when one has incoming links.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckContentDescendantsForIncomingLinksShouldReturnTrueWhenIncomingLinksForFirstLevel()
+        {
+            // arrange
+            var contentId = 123;
+
+            var children = new List<IContent>();
+
+            var child1 = new Mock<IContent>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IContent>();
+            child2.Setup(x => x.Id).Returns(000);
+
+            children.Add(child2.Object);
+
+            var child3 = new Mock<IContent>();
+            child3.Setup(x => x.Id).Returns(789);
+
+            children.Add(child3.Object);
+
+            this.contentServiceMock.Setup(x => x.GetChildren(contentId)).Returns(children);
+
+            var relations = new List<IRelation>();
+
+            relations.Add(Mock.Of<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(456, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(000, false))
+                .Returns(relations);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(789, false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckContentDescendantsForIncomingLinks(contentId);
+
+            // arrange
+            Assert.IsTrue(result);
+
+            this.contentServiceMock.Verify(x => x.GetChildren(contentId), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(456, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(000, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(789, false), Times.Never);
+        }
+
+        /// <summary>
+        /// The check content descendants for incoming links should return true when incoming links for deeper level.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckContentDescendantsForIncomingLinksShouldReturnTrueWhenIncomingLinksForDeeperLevel()
+        {
+            // arrange
+            var contentId = 123;
+
+            var children = new List<IContent>();
+
+            var child1 = new Mock<IContent>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IContent>();
+            child2.Setup(x => x.Id).Returns(000);
+
+            children.Add(child2.Object);
+
+            var child3 = new Mock<IContent>();
+            child3.Setup(x => x.Id).Returns(789);
+
+            children.Add(child3.Object);
+
+            var descendants_1 = new List<IContent>();
+
+            var descendant1 = new Mock<IContent>();
+            descendant1.Setup(x => x.Id).Returns(006);
+
+            descendants_1.Add(descendant1.Object);
+
+            var descendants_2 = new List<IContent>();
+
+            var descendant2 = new Mock<IContent>();
+            descendant2.Setup(x => x.Id).Returns(007);
+
+            descendants_2.Add(descendant2.Object);
+
+            this.contentServiceMock.Setup(x => x.GetChildren(contentId)).Returns(children);
+            this.contentServiceMock.Setup(x => x.GetChildren(child1.Object.Id)).Returns(descendants_1);
+            this.contentServiceMock.Setup(x => x.GetChildren(child2.Object.Id)).Returns(descendants_2);
+            this.contentServiceMock.Setup(x => x.GetChildren(child3.Object.Id)).Returns(new List<IContent>());
+
+            var relations = new List<IRelation>();
+
+            relations.Add(Mock.Of<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(456, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(000, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(789, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(006, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(007, false))
+                .Returns(relations);
+
+            // act
+            var result = this.controller.CheckContentDescendantsForIncomingLinks(contentId);
+
+            // arrange
+            Assert.IsTrue(result);
+
+            this.contentServiceMock.Verify(x => x.GetChildren(contentId), Times.Once);
+            this.contentServiceMock.Verify(x => x.GetChildren(child1.Object.Id), Times.Once);
+            this.contentServiceMock.Verify(x => x.GetChildren(child2.Object.Id), Times.Once);
+            this.contentServiceMock.Verify(x => x.GetChildren(child3.Object.Id), Times.Never);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(456, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(000, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(789, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(006, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(007, false), Times.Once);
+        }
+
+        /// <summary>
+        /// The check media descendants for incoming links should return false when there are no children.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckMediaDescendantsForIncomingLinksShouldReturnFalseWhenThereAreNoChildren()
+        {
+            // arrange
+            var mediaId = 123;
+
+            var children = new List<IMedia>();
+
+            this.mediaServiceMock.Setup(x => x.GetChildren(mediaId)).Returns(children);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckMediaDescendantsForIncomingLinks(mediaId);
+
+            // arrange
+            Assert.IsFalse(result);
+
+            this.mediaServiceMock.Verify(x => x.GetChildren(mediaId), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false), Times.Never);
+        }
+
+        /// <summary>
+        /// The check media descendants for incoming links should return false when they have no incoming links.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckMediaDescendantsForIncomingLinksShouldReturnFalseWhenTheyHaveNoIncomingLinks()
+        {
+            // arrange
+            var mediaId = 123;
+
+            var children = new List<IMedia>();
+
+            var child1 = new Mock<IMedia>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IMedia>();
+            child2.Setup(x => x.Id).Returns(789);
+
+            children.Add(child2.Object);
+
+            var descendants = new List<IMedia>();
+
+            var descendant1 = new Mock<IMedia>();
+            descendant1.Setup(x => x.Id).Returns(000);
+
+            this.mediaServiceMock.Setup(x => x.GetChildren(mediaId)).Returns(children);
+            this.mediaServiceMock.Setup(x => x.GetChildren(child1.Object.Id)).Returns(new List<IMedia>());
+            this.mediaServiceMock.Setup(x => x.GetChildren(child2.Object.Id)).Returns(descendants);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckMediaDescendantsForIncomingLinks(mediaId);
+
+            // arrange
+            Assert.IsFalse(result);
+
+            this.mediaServiceMock.Verify(x => x.GetChildren(mediaId), Times.Once);
+            this.mediaServiceMock.Verify(x => x.GetChildren(child1.Object.Id), Times.Once);
+            this.mediaServiceMock.Verify(x => x.GetChildren(child2.Object.Id), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(It.IsAny<int>(), false), Times.Exactly(children.Count + descendants.Count));
+        }
+
+        /// <summary>
+        /// The check media descendants for incoming links should return true when one has incoming links.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckMediaDescendantsForIncomingLinksShouldReturnTrueWhenOneHasIncomingLinksForFirstLevel()
+        {
+            // arrange
+            var mediaId = 123;
+
+            var children = new List<IMedia>();
+
+            var child1 = new Mock<IMedia>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IMedia>();
+            child2.Setup(x => x.Id).Returns(000);
+
+            children.Add(child2.Object);
+
+            var child3 = new Mock<IMedia>();
+            child3.Setup(x => x.Id).Returns(789);
+
+            children.Add(child3.Object);
+
+            this.mediaServiceMock.Setup(x => x.GetChildren(mediaId)).Returns(children);
+
+            var relations = new List<IRelation>();
+
+            relations.Add(Mock.Of<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(456, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(000, false))
+                .Returns(relations);
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(789, false))
+                .Returns(new List<IRelation>());
+
+            // act
+            var result = this.controller.CheckMediaDescendantsForIncomingLinks(mediaId);
+
+            // arrange
+            Assert.IsTrue(result);
+
+            this.mediaServiceMock.Verify(x => x.GetChildren(mediaId), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(456, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(000, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(789, false), Times.Never);
+        }
+
+        /// <summary>
+        /// The check media descendants for incoming links should return true when incoming links for deeper level.
+        /// </summary>
+        [Test]
+        [Category("Api")]
+        public void CheckMediaDescendantsForIncomingLinksShouldReturnTrueWhenIncomingLinksForDeeperLevel()
+        {
+            // arrange
+            var contentId = 123;
+
+            var children = new List<IMedia>();
+
+            var child1 = new Mock<IMedia>();
+            child1.Setup(x => x.Id).Returns(456);
+
+            children.Add(child1.Object);
+
+            var child2 = new Mock<IMedia>();
+            child2.Setup(x => x.Id).Returns(000);
+
+            children.Add(child2.Object);
+
+            var child3 = new Mock<IMedia>();
+            child3.Setup(x => x.Id).Returns(789);
+
+            children.Add(child3.Object);
+
+            var descendants_1 = new List<IMedia>();
+
+            var descendant1 = new Mock<IMedia>();
+            descendant1.Setup(x => x.Id).Returns(006);
+
+            descendants_1.Add(descendant1.Object);
+
+            var descendants_2 = new List<IMedia>();
+
+            var descendant2 = new Mock<IMedia>();
+            descendant2.Setup(x => x.Id).Returns(007);
+
+            descendants_2.Add(descendant2.Object);
+
+            this.mediaServiceMock.Setup(x => x.GetChildren(contentId)).Returns(children);
+            this.mediaServiceMock.Setup(x => x.GetChildren(child1.Object.Id)).Returns(descendants_1);
+            this.mediaServiceMock.Setup(x => x.GetChildren(child2.Object.Id)).Returns(descendants_2);
+            this.mediaServiceMock.Setup(x => x.GetChildren(child3.Object.Id)).Returns(new List<IMedia>());
+
+            var relations = new List<IRelation>();
+
+            relations.Add(Mock.Of<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(456, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(000, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(789, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(006, false))
+                .Returns(new List<IRelation>());
+
+            this.nexuServiceMock.Setup(x => x.GetNexuRelationsForContent(007, false))
+                .Returns(relations);
+
+            // act
+            var result = this.controller.CheckMediaDescendantsForIncomingLinks(contentId);
+
+            // arrange
+            Assert.IsTrue(result);
+
+            this.mediaServiceMock.Verify(x => x.GetChildren(contentId), Times.Once);
+            this.mediaServiceMock.Verify(x => x.GetChildren(child1.Object.Id), Times.Once);
+            this.mediaServiceMock.Verify(x => x.GetChildren(child2.Object.Id), Times.Once);
+            this.mediaServiceMock.Verify(x => x.GetChildren(child3.Object.Id), Times.Never);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(456, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(000, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(789, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(006, false), Times.Once);
+
+            this.nexuServiceMock.Verify(x => x.GetNexuRelationsForContent(007, false), Times.Once);
+        }
+
+
         /// <summary>
         /// Test getting rebuild status.
         /// </summary>
diff --git a/Source/Our.Umbraco.Nexu.Core.Tests/NexuMappingTests.cs b/Source/Our.Umbraco.Nexu.Core.Tests/NexuMappingTests.cs
index 9487be3..d6b9baa 100644
--- a/Source/Our.Umbraco.Nexu.Core.Tests/NexuMappingTests.cs
+++ b/Source/Our.Umbraco.Nexu.Core.Tests/NexuMappingTests.cs
@@ -1,20 +1,18 @@
 namespace Our.Umbraco.Nexu.Core.Tests
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Threading;
 
     using AutoMapper;
 
     using global::Umbraco.Core.Models;
-    using global::Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZero;
     using global::Umbraco.Core.Services;
 
     using Moq;
 
     using NUnit.Framework;
 
-    using Our.Umbraco.Nexu.Core.Mapping.Profiles;
     using Our.Umbraco.Nexu.Core.Mapping.TypeConverters;
     using Our.Umbraco.Nexu.Core.Models;
 
@@ -29,6 +27,11 @@ public class NexuMappingTests
         /// </summary>
         private Mock<IContentService> contentServiceMock;
 
+        /// <summary>
+        /// The localization service mock.
+        /// </summary>
+        private Mock<ILocalizationService> localizationServiceMock;
+
         /// <summary>
         /// Test setup.
         /// </summary>
@@ -36,8 +39,9 @@ public class NexuMappingTests
         public void Setup()
         {
             this.contentServiceMock = new Mock<IContentService>();
+            this.localizationServiceMock = new Mock<ILocalizationService>();
 
-            Mapper.CreateMap<IEnumerable<IRelation>, IEnumerable<RelatedDocument>>().ConvertUsing(new RelationsToRelatedDocumentsConverter(this.contentServiceMock.Object));
+            Mapper.CreateMap<IEnumerable<IRelation>, IEnumerable<RelatedDocument>>().ConvertUsing(new RelationsToRelatedDocumentsConverter(this.contentServiceMock.Object, this.localizationServiceMock.Object));
 
             Mapper.CreateMap<IContent, RelatedDocument>()
                 .ForMember(x => x.Properties, opt => opt.Ignore())
@@ -59,12 +63,35 @@ public void TearDown()
         /// </summary>
         [Test]
         [Category("Mappings")]
-        public void TestMapRelationsToRelatedDocuments()
+        public void TestMapRelationsToRelatedDocumentssWithDictionaryItemsInPropAndTabnames()
         {
             // arrange
+            this.localizationServiceMock.Setup(x => x.DictionaryItemExists(It.IsAny<string>())).Returns(true);
+            this.localizationServiceMock.Setup(x => x.GetDictionaryItemByKey(It.IsAny<string>()))
+                .Returns(
+                    (string s) =>
+                        {
+                            var language = Mock.Of<ILanguage>();
+
+                            Mock.Get(language).SetupGet(x => x.IsoCode)
+                                .Returns(Thread.CurrentThread.CurrentCulture.Name);
+
+                            var translation = Mock.Of<IDictionaryTranslation>();
+
+                            Mock.Get(translation).SetupGet(x => x.Value).Returns(s);
+                            Mock.Get(translation).SetupGet(x => x.Language).Returns(language);
+
+                            var dictionary = Mock.Of<IDictionaryItem>();
+
+                            Mock.Get(dictionary).SetupGet(x => x.ItemKey).Returns(s);
+                            Mock.Get(dictionary).SetupGet(x => x.Translations)
+                                .Returns(new List<IDictionaryTranslation> { translation });
+                            return dictionary;
+                        });
+
             var relation123Mock = new Mock<IRelation>();
             relation123Mock.SetupGet(x => x.ParentId).Returns(123);
-            relation123Mock.SetupGet(x => x.Comment).Returns("media [[Images]] || rte [[Content]]");
+            relation123Mock.SetupGet(x => x.Comment).Returns("#media [[#Images]] || rte [[Content]]");
 
             var relation456Mock = new Mock<IRelation>();
             relation456Mock.SetupGet(x => x.ParentId).Returns(456);
@@ -124,6 +151,7 @@ public void TestMapRelationsToRelatedDocuments()
             var destination = Mapper.Map<IEnumerable<RelatedDocument>>(input).ToList();
 
             // verify
+            this.localizationServiceMock.Verify(x => x.GetDictionaryItemByKey(It.IsAny<string>()), Times.Exactly(2));
             this.contentServiceMock.Verify(x => x.GetByIds(It.IsAny<IEnumerable<int>>()), Times.Once);
 
             Assert.AreEqual(input.Select(x => x.ParentId), actualContentIds);
@@ -157,6 +185,106 @@ public void TestMapRelationsToRelatedDocuments()
 
         }
 
+        [Test]
+        [Category("Mappings")]
+        public void TestMapRelationsToRelatedDocuments()
+        {
+            // arrange
+            var relation123Mock = new Mock<IRelation>();
+            relation123Mock.SetupGet(x => x.ParentId).Returns(123);
+            relation123Mock.SetupGet(x => x.Comment).Returns("media [[Images]] || rte [[Content]]");
+
+            var relation456Mock = new Mock<IRelation>();
+            relation456Mock.SetupGet(x => x.ParentId).Returns(456);
+            relation456Mock.SetupGet(x => x.Comment).Returns("picker [[Links]] || rte [[Content]]");
+
+            var relation789Mock = new Mock<IRelation>();
+            relation789Mock.SetupGet(x => x.ParentId).Returns(789);
+            relation789Mock.SetupGet(x => x.Comment).Returns("picker [[Images]] || media [[Images]]");
+
+            var input = new List<IRelation>
+                            {
+                                relation123Mock.Object,
+                                relation456Mock.Object,
+                                relation789Mock.Object
+                            };
+
+            IEnumerable<int> actualContentIds = new List<int>();
+
+            var contentTypeMock = new Mock<IContentType>();
+            contentTypeMock.SetupGet(x => x.Icon).Returns("page");
+
+            var contentItems = new List<IContent>();
+
+            var content123Mock = new Mock<IContent>();
+            content123Mock.SetupGet(x => x.Id).Returns(123);
+            content123Mock.SetupGet(x => x.Name).Returns("Content 123");
+            content123Mock.SetupGet(x => x.Published).Returns(true);
+            content123Mock.SetupGet(x => x.Trashed).Returns(false);
+            content123Mock.SetupGet(x => x.ContentType).Returns(contentTypeMock.Object);
+
+            var content456Mock = new Mock<IContent>();
+            content456Mock.SetupGet(x => x.Id).Returns(456);
+            content456Mock.SetupGet(x => x.Name).Returns("Content 456");
+            content456Mock.SetupGet(x => x.Published).Returns(false);
+            content456Mock.SetupGet(x => x.Trashed).Returns(false);
+            content456Mock.SetupGet(x => x.ContentType).Returns(contentTypeMock.Object);
+
+            var content789MOck = new Mock<IContent>();
+            content789MOck.SetupGet(x => x.Id).Returns(789);
+            content789MOck.SetupGet(x => x.Name).Returns("Content 789");
+            content789MOck.SetupGet(x => x.Published).Returns(false);
+            content789MOck.SetupGet(x => x.Trashed).Returns(true);
+            content789MOck.SetupGet(x => x.ContentType).Returns(contentTypeMock.Object);
+
+            contentItems.Add(content123Mock.Object);
+            contentItems.Add(content456Mock.Object);
+            contentItems.Add(content789MOck.Object);
+
+            this.contentServiceMock.Setup(x => x.GetByIds(It.IsAny<IEnumerable<int>>()))
+                .Callback(
+                    (IEnumerable<int> ids) =>
+                        {
+                            actualContentIds = ids;
+                        }).Returns(contentItems);
+
+            // act
+            var destination = Mapper.Map<IEnumerable<RelatedDocument>>(input).ToList();
+
+            // verify
+            this.contentServiceMock.Verify(x => x.GetByIds(It.IsAny<IEnumerable<int>>()), Times.Once);
+
+            Assert.AreEqual(input.Select(x => x.ParentId), actualContentIds);
+
+            Assert.IsNotNull(destination);
+            Assert.AreEqual(input.Count, destination.Count());
+
+            // properties
+            var related123Props = destination.First(x => x.Id == 123).Properties;
+
+            Assert.IsTrue(related123Props.Keys.Contains("Images"));
+            Assert.IsTrue(related123Props.Keys.Contains("Content"));
+
+            Assert.IsTrue(related123Props["Images"].Exists(x => x.Trim() == "media"));
+            Assert.IsTrue(related123Props["Content"].Exists(x => x.Trim() == "rte"));
+
+            var related456Props = destination.First(x => x.Id == 456).Properties;
+
+            Assert.IsTrue(related456Props.Keys.Contains("Links"));
+            Assert.IsTrue(related456Props.Keys.Contains("Content"));
+
+            Assert.IsTrue(related456Props["Links"].Exists(x => x.Trim() == "picker"));
+            Assert.IsTrue(related456Props["Content"].Exists(x => x.Trim() == "rte"));
+
+            var related789Props = destination.First(x => x.Id == 789).Properties;
+
+            Assert.IsTrue(related789Props.Keys.Contains("Images"));
+
+            Assert.IsTrue(related789Props["Images"].Exists(x => x.Trim() == "picker"));
+            Assert.IsTrue(related789Props["Images"].Exists(x => x.Trim() == "media"));
+
+        }
+
         /// <summary>
         /// The test mapping from content to related document.
         /// </summary>
diff --git a/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
index 1d76501..e5e25bb 100644
--- a/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
+++ b/Source/Our.Umbraco.Nexu.Core.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs b/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs
index 5518c4b..8bce50f 100644
--- a/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs
+++ b/Source/Our.Umbraco.Nexu.Core/BootStrapper.cs
@@ -8,9 +8,12 @@
     using System.Web.Routing;
 
     using AutoMapper;
-
+    
     using ObjectResolution;
 
+    using Our.Umbraco.Nexu.Core.Mapping.Profiles;
+    using Our.Umbraco.Nexu.Core.WebApi;
+
     using global::Umbraco.Core;
     using global::Umbraco.Core.Events;
     using global::Umbraco.Core.Models;
@@ -18,9 +21,6 @@
     using global::Umbraco.Web;
     using global::Umbraco.Web.UI.JavaScript;
 
-    using Our.Umbraco.Nexu.Core.Mapping.Profiles;
-    using Our.Umbraco.Nexu.Core.WebApi;
-
     /// <summary>
     /// Bootstrapper to handle umbraco startup events
     /// </summary>
@@ -28,7 +28,7 @@ internal class BootStrapper : ApplicationEventHandler
     {
         /// <inheritdoc />
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
-        {            
+        {
             using (ApplicationContext.Current.ProfilingLogger.TraceDuration<BootStrapper>("Begin ApplicationStarted", "End ApplicationStarted"))
             {
                 // set up mappings
@@ -53,7 +53,7 @@ protected override void ApplicationInitialized(UmbracoApplicationBase umbracoApp
                 // resolve property parsers
                 PropertyParserResolver.Current =
                     new PropertyParserResolver(PluginManager.Current.ResolvePropertyParsers());
-                
+
                 // resolve grid editor parsers
                 GridEditorParserResolver.Current = new GridEditorParserResolver(PluginManager.Current.ResolveGridEditorParsers());
             }
@@ -98,6 +98,8 @@ private void ServerVariablesParserParsing(object sender, Dictionary<string, obje
 
             urlDictionairy.Add("BaseApi", urlHelper.GetUmbracoApiServiceBaseUrl<NexuApiController>(c => c.GetIncomingLinks(-1)));
             urlDictionairy.Add("GetIncomingLinks", urlHelper.GetUmbracoApiService<NexuApiController>("GetIncomingLinks", null));
+            urlDictionairy.Add("CheckContentDescendantsForIncomingLinks", urlHelper.GetUmbracoApiService<NexuApiController>("CheckContentDescendantsForIncomingLinks", null));
+            urlDictionairy.Add("CheckMediaDescendantsForIncomingLinks", urlHelper.GetUmbracoApiService<NexuApiController>("CheckMediaDescendantsForIncomingLinks", null));
             urlDictionairy.Add("GetRebuildStatus", urlHelper.GetUmbracoApiService<NexuApiController>("GetRebuildStatus"));
             urlDictionairy.Add("Rebuild", urlHelper.GetUmbracoApiService<NexuApiController>("Rebuild", null));
 
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/controllers/base-delete-controller.js b/Source/Our.Umbraco.Nexu.Core/Client/controllers/base-delete-controller.js
new file mode 100644
index 0000000..2795530
--- /dev/null
+++ b/Source/Our.Umbraco.Nexu.Core/Client/controllers/base-delete-controller.js
@@ -0,0 +1,24 @@
+angular.module('umbraco').controller('Our.Umbraco.Nexu.BaseDeleteController',
+    ['$scope', '$controller', 'Our.Umbraco.Nexu.Resource',
+        function ($scope, $controller, nexuResource) {
+            // inherit core delete controller
+            angular.extend(this, $controller('Umbraco.Editors.Media.DeleteController', { $scope: $scope }));
+
+            $scope.links = {};
+            $scope.descendantsHaveLinks = false;
+            $scope.isLoading = true;
+
+            nexuResource.getIncomingLinks($scope.currentNode.id).then(function (result) {
+                $scope.links = result.data;
+
+                if (result.data.length == 0) {
+                    nexuResource.checkDescendants($scope.currentNode.id, $scope.isMedia).then(function (result) {
+                        $scope.descendantsHaveLinks = result.data;
+                        $scope.isLoading = false;
+                    });
+                } else {
+                    $scope.isLoading = false;
+                }
+
+            });
+        }]);
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/controllers/content-delete-controller.js b/Source/Our.Umbraco.Nexu.Core/Client/controllers/content-delete-controller.js
index 31cf9af..69824a7 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/controllers/content-delete-controller.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/controllers/content-delete-controller.js
@@ -1,14 +1,8 @@
 angular.module('umbraco').controller('Our.Umbraco.Nexu.ContentDeleteController',
-    ['$scope', '$controller', 'Our.Umbraco.Nexu.Resource',
-    function ($scope, $controller, nexuResource) {
-        // inherit core delete controller
-        angular.extend(this, $controller('Umbraco.Editors.Content.DeleteController', { $scope: $scope }));
+    ['$scope', '$controller', 
+    function ($scope, $controller) {
+        $scope.isMedia = false;
 
-        $scope.links = {};
-        $scope.isLoading = true;
-
-        nexuResource.getIncomingLinks($scope.currentNode.id).then(function (result) {
-            $scope.links = result.data;
-            $scope.isLoading = false;
-        });
+        // inherit base delete controller        
+        angular.extend(this, $controller('Our.Umbraco.Nexu.BaseDeleteController', { $scope: $scope }));
     }]);
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/controllers/dashboard-controller.js b/Source/Our.Umbraco.Nexu.Core/Client/controllers/dashboard-controller.js
index 0511c55..c6ef528 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/controllers/dashboard-controller.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/controllers/dashboard-controller.js
@@ -17,11 +17,11 @@
 
                     if ($scope.RebuildStatus.IsProcessing && $scope.autoRefresh) {
                         $timeout(function() { $scope.getRebuildStatus() }, 5000, true);
-                    } 
+                    }
                 });
         };
 
-        $scope.rebuild = function() {           
+        $scope.rebuild = function() {
             nexuResource.rebuild(-1)
                 .then(function(result) {
                     $scope.getRebuildStatus();
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/controllers/media-delete-controller.js b/Source/Our.Umbraco.Nexu.Core/Client/controllers/media-delete-controller.js
index af382ca..f960b11 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/controllers/media-delete-controller.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/controllers/media-delete-controller.js
@@ -1,14 +1,9 @@
 angular.module('umbraco').controller('Our.Umbraco.Nexu.MediaDeleteController',
-    ['$scope', '$controller', 'Our.Umbraco.Nexu.Resource',
-    function ($scope, $controller, nexuResource) {
-        // inherit core delete controller
-        angular.extend(this, $controller('Umbraco.Editors.Media.DeleteController', { $scope: $scope }));
+    ['$scope', '$controller', 
+    function ($scope, $controller) {
+        $scope.isMedia = true;
 
-        $scope.links = {};
-        $scope.isLoading = true;
-
-        nexuResource.getIncomingLinks($scope.currentNode.id).then(function (result) {
-            $scope.links = result.data;
-            $scope.isLoading = false;
-        });
+        // inherit base delete controller        
+        angular.extend(this, $controller('Our.Umbraco.Nexu.BaseDeleteController', { $scope: $scope }));
+        
     }]);
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/controllers/unpublish-confirmation-controller.js b/Source/Our.Umbraco.Nexu.Core/Client/controllers/unpublish-confirmation-controller.js
index 6c323ce..f25596c 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/controllers/unpublish-confirmation-controller.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/controllers/unpublish-confirmation-controller.js
@@ -1,17 +1,19 @@
 angular.module('umbraco').controller('Our.Umbraco.Nexu.UnPublishConfirmationController',
-    ['$scope','notificationsService', 
+    ['$scope','notificationsService',
     function ($scope, notificationsService) {
 
         $scope.links = $scope.notification.args.links;
 
-        $scope.publish = function (notification) {            
+        $scope.descendantsHaveLinks = $scope.notification.args.descendantsHaveLinks;
+
+        $scope.publish = function (notification) {
             notificationsService.remove(notification);
 
             // execute the deferred unpublish request
-            notification.args.deferredPromise.resolve(notification.args.originalRequest);            
+            notification.args.deferredPromise.resolve(notification.args.originalRequest);
         };
 
-        $scope.cancel = function (notification) {            
+        $scope.cancel = function (notification) {
             notificationsService.remove(notification);
         };
 
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/directives/nexuDescendantsWarning.js b/Source/Our.Umbraco.Nexu.Core/Client/directives/nexuDescendantsWarning.js
new file mode 100644
index 0000000..134c8e1
--- /dev/null
+++ b/Source/Our.Umbraco.Nexu.Core/Client/directives/nexuDescendantsWarning.js
@@ -0,0 +1,9 @@
+angular.module("umbraco.directives")
+    .directive('nexuDescendantsWarning', function () {
+        return {
+            restrict: "E",    // restrict to an element
+            replace: true,   // replace the html element with the template
+            transclude: true,
+            templateUrl: '/App_Plugins/Nexu/views/nexu-descendants-warning.html'            
+        };
+    });
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/interceptor.js b/Source/Our.Umbraco.Nexu.Core/Client/interceptor.js
index d501348..5b41d62 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/interceptor.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/interceptor.js
@@ -8,7 +8,7 @@
 
                    // Redirect any requests to built in content delete to our custom delete
                    if (request.url.indexOf("views/content/delete.html") === 0) {
-                       request.url = '/App_Plugins/Nexu/views/content-delete.html';                      
+                       request.url = '/App_Plugins/Nexu/views/content-delete.html';
                    }
 
                    // Redirect any requests to built in media delete to our custom delete
@@ -19,15 +19,15 @@
                    var unpublishUrlRegex = /^\/umbraco\/backoffice\/UmbracoApi\/Content\/PostUnPublish\?id=(\d*)$/i;
 
                    // check if unpublished api call is made
-                   if(unpublishUrlRegex.test(request.url)) {                                        
+                   if(unpublishUrlRegex.test(request.url)) {
                        // get the id from the url
                        var id = unpublishUrlRegex.exec(request.url)[1];
 
-                       // get nexuResource 
+                       // get nexuResource
                        var nexuService = $injector.get('Our.Umbraco.Nexu.Resource');
 
                        // create deferred request
-                       var deferred = $q.defer();                     
+                       var deferred = $q.defer();
 
                        // get incoming links
                        nexuService.getIncomingLinks(id)
@@ -41,20 +41,38 @@
                                        args: {
                                            links: result.data,
                                            deferredPromise: deferred,
-                                           originalRequest : request
+                                           originalRequest: request,
+                                           descendantsHaveLinks : false
                                        }
-                                   });                                  
+                                   });
                                } else {
-                                   // execute request as normal
-                                   deferred.resolve(request);
+                                   nexuService.checkDescendants(id, false).then(function(result) {
+                                       if (result.data) {
+                                           notificationsService.add({
+                                               // the path of our custom notification view
+                                               view: "/App_Plugins/Nexu/views/unpublish-confirmation.html",
+                                               // arguments object we want to pass to our custom notification
+                                               args: {
+                                                   links: [],
+                                                   deferredPromise: deferred,
+                                                   originalRequest: request,
+                                                   descendantsHaveLinks: true
+                                               }
+                                           });
+                                       } else {
+                                           // execute request as normal
+                                           deferred.resolve(request);
+                                       }
+                                   });
+                                   
                                }
                            });
 
                        // return deferred promise
                        return deferred.promise;
-                      
+
                    }
-                       
+
                    return request || $q.when(request);
                }
            };
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/lang/en-GB.xml b/Source/Our.Umbraco.Nexu.Core/Client/lang/en-GB.xml
index 25940ab..0fb66f1 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/lang/en-GB.xml
+++ b/Source/Our.Umbraco.Nexu.Core/Client/lang/en-GB.xml
@@ -11,5 +11,6 @@
     <key alias="linksTitleContent">This page is linked to from following items</key>
     <key alias="linksTitleMedia">This media item is linked to from following items</key>
     <key alias="unpublishConfirmation">Are you sure you want to unpublish</key>
+    <key alias="descendantsHaveLinksWarning">One of the sub items is linked from another content item</key>
   </area>
 </language>
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/lang/en-US.xml b/Source/Our.Umbraco.Nexu.Core/Client/lang/en-US.xml
index 4a42869..0de07d1 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/lang/en-US.xml
+++ b/Source/Our.Umbraco.Nexu.Core/Client/lang/en-US.xml
@@ -11,5 +11,6 @@
     <key alias="linksTitleContent">This page is linked to from following items</key>
     <key alias="linksTitleMedia">This media item is linked to from following items</key>
     <key alias="unpublishConfirmation">Are you sure you want to unpublish</key>
+    <key alias="descendantsHaveLinksWarning">One of the sub items is linked from another content item</key>
   </area>
 </language>
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/lang/nl-NL.xml b/Source/Our.Umbraco.Nexu.Core/Client/lang/nl-NL.xml
index 7cfc5eb..6158f39 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/lang/nl-NL.xml
+++ b/Source/Our.Umbraco.Nexu.Core/Client/lang/nl-NL.xml
@@ -11,5 +11,6 @@
     <key alias="linksTitleContent">Er wordt naar deze pagina gelinkt vanuit deze paginas</key>
     <key alias="linksTitleMedia">Er wordt naar dit bestand gelinkt vanuit deze paginas</key>
     <key alias="unpublishConfirmation">Bent u zeker dat u deze pagina wil depubliceren</key>
+    <key alias="descendantsHaveLinksWarning">Eén van de onderliggende items is gelinkt in een andere pagina</key>
   </area>
 </language>
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/package.manifest b/Source/Our.Umbraco.Nexu.Core/Client/package.manifest
index 8056271..5cce275 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/package.manifest
+++ b/Source/Our.Umbraco.Nexu.Core/Client/package.manifest
@@ -1,14 +1,16 @@
-{           
-    javascript: [
-		'~/App_Plugins/Nexu/interceptor.js',
-		'~/App_Plugins/Nexu/resource.js',
-		'~/App_Plugins/Nexu/controllers/content-delete-controller.js',
-		'~/App_Plugins/Nexu/controllers/media-delete-controller.js',
-		'~/App_Plugins/Nexu/controllers/unpublish-confirmation-controller.js',
-		'~/App_Plugins/Nexu/controllers/dashboard-controller.js',
-		'~/App_Plugins/Nexu/directives/nexuLinks.js'
-    ],
-	css: [
-       '~/App_Plugins/Nexu/nexu.css'
-   ]	
+{
+  javascript: [
+    '~/App_Plugins/Nexu/interceptor.js',
+    '~/App_Plugins/Nexu/resource.js',
+	'~/App_Plugins/Nexu/controllers/base-delete-controller.js',
+    '~/App_Plugins/Nexu/controllers/content-delete-controller.js',
+    '~/App_Plugins/Nexu/controllers/media-delete-controller.js',
+    '~/App_Plugins/Nexu/controllers/unpublish-confirmation-controller.js',
+    '~/App_Plugins/Nexu/controllers/dashboard-controller.js',
+    '~/App_Plugins/Nexu/directives/nexuLinks.js',
+	'~/App_Plugins/Nexu/directives/nexuDescendantsWarning.js'
+  ],
+  css: [
+    '~/App_Plugins/Nexu/nexu.css'
+  ]
 }
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/resource.js b/Source/Our.Umbraco.Nexu.Core/Client/resource.js
index 12a6f85..3673c05 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/resource.js
+++ b/Source/Our.Umbraco.Nexu.Core/Client/resource.js
@@ -4,6 +4,13 @@
                 getIncomingLinks: function (id) {
                     return $http.get(Umbraco.Sys.ServerVariables.Nexu.GetIncomingLinks + "?contentId=" + id);
                 },
+                checkDescendants: function (id, isMedia) {
+                    if (isMedia) {
+                        return $http.get(Umbraco.Sys.ServerVariables.Nexu.CheckMediaDescendantsForIncomingLinks + "?mediaId=" + id);
+                    }
+
+                    return $http.get(Umbraco.Sys.ServerVariables.Nexu.CheckContentDescendantsForIncomingLinks + "?contentId=" + id);
+                },
                 getRebuildStatus : function() {
                     return $http.get(Umbraco.Sys.ServerVariables.Nexu.GetRebuildStatus);
                 },
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html b/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html
index 99ce7b2..88cd75a 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html
+++ b/Source/Our.Umbraco.Nexu.Core/Client/views/content-delete.html
@@ -1,7 +1,12 @@
 <div class="umb-dialog umb-pane" ng-controller="Our.Umbraco.Nexu.ContentDeleteController">
+    <umb-load-indicator ng-if="isLoading">
+    </umb-load-indicator>
+
     <div class="umb-dialog-body" auto-scale="90" ng-hide="isLoading">
-        
+
         <nexu-links links="links" link-clicked="cancel" title="nexu_linksTitleContent"></nexu-links>
+        
+        <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
 
         <p class="umb-abstract">
             <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html b/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html
index 8d11bb6..5b0735a 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html
+++ b/Source/Our.Umbraco.Nexu.Core/Client/views/media-delete.html
@@ -1,14 +1,19 @@
 <div class="umb-dialog umb-pane" ng-controller="Our.Umbraco.Nexu.MediaDeleteController">
-    <div class="umb-dialog-body" auto-scale="90" ng-hide="isLoading" >
+    <umb-load-indicator ng-if="isLoading">
+    </umb-load-indicator>
 
-        <nexu-links links="links" link-clicked="cancel" title="nexu_linksTitleMedia"></nexu-links>
+        <div class="umb-dialog-body" auto-scale="90" ng-hide="isLoading">
 
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
+            <nexu-links links="links" link-clicked="cancel" title="nexu_linksTitleMedia"></nexu-links>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">
-        </umb-confirm>
+            <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
 
-    </div>
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel">
+            </umb-confirm>
+
+        </div>
 </div>
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-descendants-warning.html b/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-descendants-warning.html
new file mode 100644
index 0000000..4eaecdd
--- /dev/null
+++ b/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-descendants-warning.html
@@ -0,0 +1,3 @@
+<div>
+    <p><i class="icon icon-alert color-red" style="font-size:20px"></i> <localize key="nexu_descendantsHaveLinksWarning">One of the sub items is linked from another content item</localize></p>
+</div>
\ No newline at end of file
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-links.html b/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-links.html
index 6b1bd65..cbc8320 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-links.html
+++ b/Source/Our.Umbraco.Nexu.Core/Client/views/nexu-links.html
@@ -1,11 +1,11 @@
-<div ng-hide="links.length == 0">   
+<div ng-hide="links.length == 0">
     <p><localize key="{{title}}"></localize></p>
     <ul class="nexu-links">
-        <li ng-repeat="link in links">            
-            <i class="icon umb-tree-icon {{link.Icon}}"></i><a ng-click="handleLinkClick(link.Id)" href={{getEditLink(link.Id)}}><span ng-class="{'deleted' : link.Trashed, 'unpublished' : !link.Published && !link.Trashed}">{{link.Name}}</span></a> - 
+        <li ng-repeat="link in links">
+            <i class="icon umb-tree-icon {{link.Icon}}"></i><a ng-click="handleLinkClick(link.Id)" href={{getEditLink(link.Id)}}><span ng-class="{'deleted' : link.Trashed, 'unpublished' : !link.Published && !link.Trashed}">{{link.Name}}</span></a> -
             <small ng-hide="$parent.currentIndex == $index" ><a href="#" ng-click="$parent.showProperties($index)" prevent-default><i class="icon icon-navigation-down"></i><localize key="nexu_linksShowProperties">Show properties</localize></a></small>
             <small ng-show="$parent.currentIndex == $index"><a href="#" ng-click="$parent.hideProperties()" prevent-default><i class="icon icon-navigation-up"></i><localize key="nexu_linksHideProperties">Hide properties</localize></a></small>
-            
+
             <div ng-if="$parent.currentIndex == $index" class="nexu-properties">
                 <div ng-repeat="(key,val) in link.Properties">
                     <p>
diff --git a/Source/Our.Umbraco.Nexu.Core/Client/views/unpublish-confirmation.html b/Source/Our.Umbraco.Nexu.Core/Client/views/unpublish-confirmation.html
index 7747f3c..549d7e6 100644
--- a/Source/Our.Umbraco.Nexu.Core/Client/views/unpublish-confirmation.html
+++ b/Source/Our.Umbraco.Nexu.Core/Client/views/unpublish-confirmation.html
@@ -1,5 +1,6 @@
 <div ng-controller="Our.Umbraco.Nexu.UnPublishConfirmationController" class="unpublish-confirmation">
     <nexu-links links="links" link-clicked="hide" title="nexu_linksTitleContent"></nexu-links> 
+    <nexu-descendants-warning ng-if="descendantsHaveLinks"></nexu-descendants-warning>
     <p><localize key="nexu_unpublishConfirmation">Are you sure you wish to unpublish</localize></p>    
     <button class="btn btn-warning" ng-click="publish(notification)"><localize key="general_ok">Ok</localize></button>
     <button class="btn " ng-click="cancel(notification)"><localize key="general_cancel">Cancel</localize></button>
diff --git a/Source/Our.Umbraco.Nexu.Core/Mapping/TypeConverters/RelationsToRelatedDocumentsConverter.cs b/Source/Our.Umbraco.Nexu.Core/Mapping/TypeConverters/RelationsToRelatedDocumentsConverter.cs
index e08b5f4..5177097 100644
--- a/Source/Our.Umbraco.Nexu.Core/Mapping/TypeConverters/RelationsToRelatedDocumentsConverter.cs
+++ b/Source/Our.Umbraco.Nexu.Core/Mapping/TypeConverters/RelationsToRelatedDocumentsConverter.cs
@@ -1,4 +1,6 @@
-namespace Our.Umbraco.Nexu.Core.Mapping.TypeConverters
+using System.Threading;
+
+namespace Our.Umbraco.Nexu.Core.Mapping.TypeConverters
 {
     using System;
     using System.Collections.Generic;
@@ -23,12 +25,18 @@ internal class RelationsToRelatedDocumentsConverter : ITypeConverter<IEnumerable
         /// </summary>
         private readonly IContentService contentService;
 
+        /// <summary>
+        /// The localization service.
+        /// </summary>
+        private readonly ILocalizationService localizationService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RelationsToRelatedDocumentsConverter"/> class.
         /// </summary>
         public RelationsToRelatedDocumentsConverter()
         {
             this.contentService = ApplicationContext.Current.Services.ContentService;
+            this.localizationService = ApplicationContext.Current.Services.LocalizationService;
         }
 
         /// <summary>
@@ -37,9 +45,13 @@ public RelationsToRelatedDocumentsConverter()
         /// <param name="contentservice">
         /// The contentservice.
         /// </param>
-        public RelationsToRelatedDocumentsConverter(IContentService contentservice)
+        /// <param name="localizationService">
+        /// The localization Service.
+        /// </param>
+        public RelationsToRelatedDocumentsConverter(IContentService contentservice, ILocalizationService localizationService)
         {
             this.contentService = contentservice;
+            this.localizationService = localizationService;
         }
 
         /// <summary>
@@ -72,10 +84,12 @@ public IEnumerable<RelatedDocument> Convert(ResolutionContext context)
                 return destination;
             }
 
-            var ids = source.Select(x => x.ParentId).ToList();            
+            var ids = source.Select(x => x.ParentId).ToList();
 
             var contentItems = this.contentService.GetByIds(ids).ToList();
 
+            var language = Thread.CurrentThread.CurrentCulture.Name;
+
             destination = Mapper.Map<IEnumerable<RelatedDocument>>(contentItems).ToList();
 
             // set the comments from the relation
@@ -94,7 +108,7 @@ public IEnumerable<RelatedDocument> Convert(ResolutionContext context)
                         foreach (var prop in commentItems)
                         {
                             var matches = Regex.Matches(prop, "(.*)(?:\\[\\[)([^\\]\\]]*)(?:\\]\\])");
-                            
+
                             var tabname = matches[0].Groups[2].Value;
 
                             if (string.IsNullOrEmpty(tabname))
@@ -102,18 +116,58 @@ public IEnumerable<RelatedDocument> Convert(ResolutionContext context)
                                 tabname = "Generic";
                             }
 
+                            if (tabname.StartsWith("#"))
+                            {
+                                if (this.localizationService.DictionaryItemExists(tabname.Substring(1)))
+                                {
+                                    var dictionaryItem = this.localizationService.GetDictionaryItemByKey(tabname.Substring(1));
+                                    if (dictionaryItem != null)
+                                    {
+                                        var translations = dictionaryItem.Translations.ToList();
+                                        if (translations.Any())
+                                        {
+                                            var translation = translations.SingleOrDefault(x => x.Language.IsoCode == language);
+                                            if (translation != null)
+                                            {
+                                                tabname = translation.Value;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            var propertyName = matches[0].Groups[1].Value;
+                            if (propertyName.StartsWith("#"))
+                            {
+                                if (this.localizationService.DictionaryItemExists(propertyName.Substring(1)))
+                                {
+                                    var dictionaryItem = this.localizationService.GetDictionaryItemByKey(propertyName.Substring(1));
+                                    if (dictionaryItem != null)
+                                    {
+                                        var translations = dictionaryItem.Translations.ToList();
+                                        if (translations.Any())
+                                        {
+                                            var translation = translations.SingleOrDefault(x => x.Language.IsoCode == language);
+                                            if (translation != null)
+                                            {
+                                                propertyName = translation.Value;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                             if (item.Properties.ContainsKey(tabname))
                             {
-                                item.Properties[tabname].Add(matches[0].Groups[1].Value);
+                                item.Properties[tabname].Add(propertyName);
                             }
                             else
                             {
-                                item.Properties.Add(tabname, new List<string> { matches[0].Groups[1].Value});
+                                item.Properties.Add(tabname, new List<string> { propertyName });
                             }
                         }
                     }
                 }
-                
+
             }
 
             return destination;
diff --git a/Source/Our.Umbraco.Nexu.Core/NexuService.cs b/Source/Our.Umbraco.Nexu.Core/NexuService.cs
index 730414a..c0f277b 100644
--- a/Source/Our.Umbraco.Nexu.Core/NexuService.cs
+++ b/Source/Our.Umbraco.Nexu.Core/NexuService.cs
@@ -4,17 +4,17 @@
     using System.Collections.Generic;
     using System.Linq;
 
-    using global::Umbraco.Core;
-    using global::Umbraco.Core.Logging;
-    using global::Umbraco.Core.Models;
-    using global::Umbraco.Core.Services;
-
     using Our.Umbraco.Nexu.Core.Constants;
     using Our.Umbraco.Nexu.Core.Enums;
     using Our.Umbraco.Nexu.Core.Interfaces;
     using Our.Umbraco.Nexu.Core.Models;
     using Our.Umbraco.Nexu.Core.ObjectResolution;
 
+    using global::Umbraco.Core;
+    using global::Umbraco.Core.Logging;
+    using global::Umbraco.Core.Models;
+    using global::Umbraco.Core.Services;
+
     /// <summary>
     /// Nexu service
     /// </summary>
@@ -28,25 +28,25 @@ internal class NexuService : INexuService
         /// <summary>
         /// The profiler.
         /// </summary>
-        private ProfilingLogger profiler;
+        private readonly ProfilingLogger profiler;
 
         /// <summary>
         /// The property parser resolver.
         /// </summary>
-        private PropertyParserResolver propertyParserResolver;
+        private readonly PropertyParserResolver propertyParserResolver;
 
         /// <summary>
         /// The relation service.
         /// </summary>
-        private IRelationService relationService;
+        private readonly IRelationService relationService;
 
         /// <summary>
         /// The data type service.
         /// </summary>
-        private IDataTypeService dataTypeService;
+        private readonly IDataTypeService dataTypeService;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="NexuService"/> class. 
+        /// Initializes a new instance of the <see cref="NexuService"/> class.
         /// </summary>
         /// <param name="profiler">
         /// The profiler.
@@ -126,8 +126,8 @@ public virtual Dictionary<string, IEnumerable<ILinkedEntity>> GetLinkedEntitesFo
                 // get linked entities fro the properties that we found a parsers for
                 parsableProperties.ForEach(
                     pp =>
-                        {                           
-                            linkedEntities.Add(pp.Property.PropertyType.Name + " [[" + pp.TabName + "]]" , pp.Parser.GetLinkedEntities(pp.Property.Value).ToList());                            
+                        {
+                            linkedEntities.Add(pp.Property.PropertyType.Name + " [[" + pp.TabName + "]]" , pp.Parser.GetLinkedEntities(pp.Property.Value).ToList());
                         });
 
                 return linkedEntities;
@@ -187,7 +187,7 @@ public virtual IEnumerable<PropertyWithParser> GetParsablePropertiesForContent(I
                                 {
                                     tabname = propertyTabDictionairy[p.Alias];
                                 }
-                                                               
+
                                 properties.Add(new PropertyWithParser(p, parser, tabname));
                             }
                         });
@@ -228,8 +228,8 @@ public virtual IEnumerable<IRelation> GetNexuRelationsForContent(int contentId,
         {
             var relations = Enumerable.Empty<IRelation>().ToList();
 
-            relations = isParent ? this.relationService.GetByParentId(contentId).ToList() : this.relationService.GetByChildId(contentId).ToList();                
-            
+            relations = isParent ? this.relationService.GetByParentId(contentId).ToList() : this.relationService.GetByChildId(contentId).ToList();
+
             if (!relations.Any())
             {
                 return relations;
@@ -347,7 +347,7 @@ public virtual void SetupRelationTypes()
                 {
                     this.SetupDocumentToMediaRelationType();
                 }
-               
+
             }
         }
 
diff --git a/Source/Our.Umbraco.Nexu.Core/Our.Umbraco.Nexu.Core.csproj b/Source/Our.Umbraco.Nexu.Core/Our.Umbraco.Nexu.Core.csproj
index 2fb0962..029d868 100644
--- a/Source/Our.Umbraco.Nexu.Core/Our.Umbraco.Nexu.Core.csproj
+++ b/Source/Our.Umbraco.Nexu.Core/Our.Umbraco.Nexu.Core.csproj
@@ -303,8 +303,10 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <Content Include="Client\controllers\base-delete-controller.js" />
     <Content Include="Client\controllers\content-delete-controller.js" />
     <Content Include="Client\controllers\dashboard-controller.js" />
+    <Content Include="Client\directives\nexuDescendantsWarning.js" />
     <Content Include="Client\lang\nl-NL.xml" />
     <Content Include="Client\lang\en-US.xml" />
     <Content Include="Client\lang\en-GB.xml" />
@@ -317,6 +319,7 @@
     <Content Include="Client\resource.js" />
     <Content Include="Client\views\content-delete.html" />
     <Content Include="Client\views\media-delete.html" />
+    <Content Include="Client\views\nexu-descendants-warning.html" />
     <Content Include="Client\views\nexu-links.html" />
     <Content Include="Client\views\unpublish-confirmation.html" />
   </ItemGroup>
diff --git a/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
index 1b93928..d528dad 100644
--- a/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
+++ b/Source/Our.Umbraco.Nexu.Core/Properties/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
 
 
diff --git a/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs b/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs
index 59f4ea5..e35caaf 100644
--- a/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs
+++ b/Source/Our.Umbraco.Nexu.Core/WebApi/NexuApiController.cs
@@ -1,6 +1,5 @@
 namespace Our.Umbraco.Nexu.Core.WebApi
 {
-    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Net;
@@ -15,7 +14,6 @@
     using global::Umbraco.Core.Services;
     using global::Umbraco.Web;
     using global::Umbraco.Web.Editors;
-    using global::Umbraco.Web.WebApi;
 
     using Our.Umbraco.Nexu.Core.Interfaces;
     using Our.Umbraco.Nexu.Core.Models;
@@ -40,11 +38,17 @@ public class NexuApiController : UmbracoAuthorizedJsonController
         /// </summary>
         private readonly IContentService contentService;
 
+        /// <summary>
+        /// The media service.
+        /// </summary>
+        private readonly IMediaService mediaService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="NexuApiController"/> class.
         /// </summary>
         public NexuApiController()
         {
+            this.mediaService = this.Services.MediaService;
             this.contentService = this.Services.ContentService;
             this.mappingEngine = AutoMapper.Mapper.Engine;
             this.nexuService = NexuService.Current;
@@ -65,11 +69,15 @@ public NexuApiController()
         /// <param name="contentService">
         /// The content Service.
         /// </param>
-        internal NexuApiController(UmbracoContext umbracoContext, INexuService nexuService,  IMappingEngine mappingEngine, IContentService contentService) : base(umbracoContext)
+        /// <param name="mediaService">
+        /// The media Service.
+        /// </param>
+        internal NexuApiController(UmbracoContext umbracoContext, INexuService nexuService,  IMappingEngine mappingEngine, IContentService contentService, IMediaService mediaService) : base(umbracoContext)
         {
             this.nexuService = nexuService;
             this.mappingEngine = mappingEngine;
             this.contentService = contentService;
+            this.mediaService = mediaService;
         }
 
         /// <summary>
@@ -85,11 +93,55 @@ public HttpResponseMessage GetIncomingLinks(int contentId)
         {
             var relations = this.nexuService.GetNexuRelationsForContent(contentId, false);
 
-            var relatedDocs = this.mappingEngine.Map<IEnumerable<RelatedDocument>>(relations.ToList());           
+            var relatedDocs = this.mappingEngine.Map<IEnumerable<RelatedDocument>>(relations.ToList());
 
             return this.Request.CreateResponse(HttpStatusCode.OK, relatedDocs);
         }
 
+        /// <summary>
+        /// Check descendants for incoming links.
+        /// </summary>
+        /// <param name="contentid">
+        /// The contentid.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        [HttpGet]
+        public bool CheckContentDescendantsForIncomingLinks(int contentid)
+        {
+            var children = this.contentService.GetChildren(contentid).ToList();
+
+            if (children.Count == 0)
+            {
+                return false;
+            }
+
+            return this.CheckDescendantsOfContentTreeForIncomingLinks(children);
+        }
+
+        /// <summary>
+        /// Check media descendants for incoming links.
+        /// </summary>
+        /// <param name="mediaId">
+        /// The media id.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        [HttpGet]
+        public bool CheckMediaDescendantsForIncomingLinks(int mediaId)
+        {
+            var children = this.mediaService.GetChildren(mediaId).ToList();
+
+            if (children.Count == 0)
+            {
+                return false;
+            }
+
+            return this.CheckDescendantsOfMediaTreeForIncomingLinks(children);
+        }
+
         /// <summary>
         /// Gets the rebuild status.
         /// </summary>
@@ -109,7 +161,7 @@ public HttpResponseMessage GetRebuildStatus()
         }
 
         /// <summary>
-        /// Rebuilds relations 
+        /// Rebuilds relations
         /// </summary>
         /// <param name="id">
         /// The id.
@@ -119,7 +171,7 @@ public HttpResponseMessage GetRebuildStatus()
         /// </returns>
         [HttpGet]
         public HttpResponseMessage Rebuild(int id = Constants.System.Root)
-        {            
+        {
             Thread backgroundRebuild = new Thread(new ParameterizedThreadStart(this.RebuildJob));
             backgroundRebuild.IsBackground = true;
             backgroundRebuild.Name = "NexuRebuildJob";
@@ -169,8 +221,8 @@ internal void RebuildJob(object id)
             foreach (var item in rootLevelItems)
             {
                 this.ParseContent(item);
-            } 
-            
+            }
+
             // parser recyle bin
             if (attempInt.Result == Constants.System.Root)
             {
@@ -180,7 +232,7 @@ internal void RebuildJob(object id)
                 {
                     this.ParseContent(item);
                 }
-            }           
+            }
 
             // reset context variables after processing
             NexuContext.Current.IsProcessing = false;
@@ -214,5 +266,91 @@ private void ParseContent(IContent item)
                 this.ParseContent(child);
             }
         }
+
+        /// <summary>
+        /// Check descendants of content tree for incoming links recursively
+        /// </summary>
+        /// <param name="items">
+        /// The items.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        private bool CheckDescendantsOfContentTreeForIncomingLinks(IEnumerable<IContent> items)
+        {
+            var childIds = new List<int>();
+
+            foreach (var item in items)
+            {
+                var relations = this.nexuService.GetNexuRelationsForContent(item.Id, false).ToList();
+
+                if (relations.Any())
+                {
+                    return true;
+                }
+
+                childIds.Add(item.Id);
+            }
+
+            foreach (var id in childIds)
+            {
+                var children = this.contentService.GetChildren(id).ToList();
+
+                if (children.Count != 0)
+                {
+                    var hasLinks = this.CheckDescendantsOfContentTreeForIncomingLinks(children);
+
+                    if (hasLinks)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Check descendants of media tree for incoming links recursively
+        /// </summary>
+        /// <param name="items">
+        /// The items.
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        private bool CheckDescendantsOfMediaTreeForIncomingLinks(IEnumerable<IMedia> items)
+        {
+            var childIds = new List<int>();
+
+            foreach (var item in items)
+            {
+                var relations = this.nexuService.GetNexuRelationsForContent(item.Id, false).ToList();
+
+                if (relations.Any())
+                {
+                    return true;
+                }
+
+                childIds.Add(item.Id);
+            }
+
+            foreach (var id in childIds)
+            {
+                var children = this.mediaService.GetChildren(id).ToList();
+
+                if (children.Count != 0)
+                {
+                    var hasLinks = this.CheckDescendantsOfMediaTreeForIncomingLinks(children);
+
+                    if (hasLinks)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
     }
 }
diff --git a/Source/Our.Umbraco.Nexu.Parsers.Tests/GridEditorParsers/Community/LeBlenderGridEditorParserTests.cs b/Source/Our.Umbraco.Nexu.Parsers.Tests/GridEditorParsers/Community/LeBlenderGridEditorParserTests.cs
new file mode 100644
index 0000000..2d5afcc
--- /dev/null
+++ b/Source/Our.Umbraco.Nexu.Parsers.Tests/GridEditorParsers/Community/LeBlenderGridEditorParserTests.cs
@@ -0,0 +1,175 @@
+namespace Our.Umbraco.Nexu.Parsers.Tests.GridEditorParsers.Community
+{
+    using System;
+    using System.Linq;
+
+    using global::Umbraco.Core.Models;
+    using global::Umbraco.Core.Services;
+
+    using Moq;
+
+    using NUnit.Framework;
+
+    using Our.Umbraco.Nexu.Core.Enums;
+    using Our.Umbraco.Nexu.Parsers.GridEditorParsers.Community;
+
+    /// <summary>
+    /// The media grid editor parser tests.
+    /// </summary>
+    [TestFixture]
+    public class LeBlenderGridEditorParserTests : BaseParserTest
+    {
+        /// <summary>
+        /// The test is parser for valid view
+        /// </summary>
+        [Test]
+        [Category("GridEditorParsers")]
+        [Category("CommunityGridEditorParsers")]
+        public void TestIsParserForValidView()
+        {
+            // arrange            
+            var parser = new LeBlenderGridEditorParser();
+
+            // act
+            var result = parser.IsParserFor("/App_Plugins/LeBlender/editors/leblendereditor/LeBlendereditor.html");
+
+            // verify
+            Assert.IsTrue(result);
+        }
+
+        /// <summary>
+        /// The test is parser for in valid data type.
+        /// </summary>
+        [Test]
+        [Category("GridEditorParsers")]
+        [Category("CommunityGridEditorParsers")]
+        public void TestIsParserForInValidView()
+        {
+            // arrange            
+            var parser = new LeBlenderGridEditorParser();
+
+            // act
+            var result = parser.IsParserFor("foo");
+
+            // verify
+            Assert.IsFalse(result);
+        }
+
+        /// <summary>
+        /// The test get linked entities with empty value.
+        /// </summary>
+        [Test]
+        [Category("GridEditorParsers")]
+        [Category("CommunityGridEditorParsers")]
+        public void TestGetLinkedEntitiesWithEmptyValue()
+        {
+            // arrange            
+            var parser = new LeBlenderGridEditorParser();
+
+            // act
+            var result = parser.GetLinkedEntities(null);
+
+            // verify
+            Assert.IsNotNull(result);
+
+            Assert.AreEqual(0, result.Count());
+        }
+
+        /// <summary>
+        /// The test get linked entities.
+        /// </summary>
+        [Test]
+        [Category("GridEditorParsers")]
+        [Category("CommunityGridEditorParsers")]
+        public void TestGetLinkedEntities()
+        {
+            // arrange            
+            var dataTypeServiceMock = new Mock<IDataTypeService>();
+            
+            var contentPickerDataTypeDefinition = new DataTypeDefinition(global::Umbraco.Core.Constants.PropertyEditors.ContentPickerAlias)
+                                                      {
+                                                          Key = Guid.NewGuid()
+                                                      };
+
+            var mediaPickerDataTypeDefinition = new DataTypeDefinition(global::Umbraco.Core.Constants.PropertyEditors.MediaPickerAlias)
+                                                    {
+                Key = Guid.NewGuid()
+            };
+
+            var rteDataTypeDefinition = new DataTypeDefinition(global::Umbraco.Core.Constants.PropertyEditors.TinyMCEAlias)
+                                            {
+                Key = Guid.NewGuid()
+            };
+
+            var stringDataTypeDefinition = new DataTypeDefinition(global::Umbraco.Core.Constants.PropertyEditors.TextboxAlias)
+                                               {
+                Key = Guid.NewGuid()
+            };
+           
+            dataTypeServiceMock.Setup(x => x.GetDataTypeDefinitionById(contentPickerDataTypeDefinition.Key))
+                .Returns(contentPickerDataTypeDefinition);
+            dataTypeServiceMock.Setup(x => x.GetDataTypeDefinitionById(mediaPickerDataTypeDefinition.Key))
+                .Returns(mediaPickerDataTypeDefinition);
+            dataTypeServiceMock.Setup(x => x.GetDataTypeDefinitionById(rteDataTypeDefinition.Key))
+                .Returns(rteDataTypeDefinition);
+            dataTypeServiceMock.Setup(x => x.GetDataTypeDefinitionById(stringDataTypeDefinition.Key))
+                .Returns(stringDataTypeDefinition);
+
+            var parser = new LeBlenderGridEditorParser(dataTypeServiceMock.Object);
+
+            var rteLinkId = 1079;
+            var rteMediaId = 1080;
+            var mediaPickerId = 1068;
+            var contentPickerId = 1086;
+
+            string value = $@"[
+   {{
+      ""title"":{{
+         ""value"":""Test"",
+         ""dataTypeGuid"":""{stringDataTypeDefinition.Key}"",
+         ""editorAlias"":""title"",
+         ""editorName"":""Title""
+      }},
+      ""text"":{{
+         ""value"":""<p>Content with <a data-id=\""{rteLinkId}\"" href=\""/{{localLink:{rteLinkId}}}\"" title=\""Contact\"">links</a></p>\n<p>�</p>\n<p>And media</p>\n<p><img style=\""width: 500px; height:333.49609375px;\"" src=\""/media/1052/boston-city-flow.jpg?width=500&amp;height=333.49609375\"" alt=\""\"" rel=\""{rteMediaId}\"" data-id=\""{rteMediaId}\"" /></p>"",
+         ""dataTypeGuid"":""{rteDataTypeDefinition.Key}"",
+         ""editorAlias"":""text"",
+         ""editorName"":""Text""
+      }},
+      ""media"":{{
+         ""value"":""{mediaPickerId}"",
+         ""dataTypeGuid"":""{mediaPickerDataTypeDefinition.Key}"",
+         ""editorAlias"":""media"",
+         ""editorName"":""Media""
+      }},
+      ""content"":{{
+         ""value"":""{contentPickerId}"",
+         ""dataTypeGuid"":""{contentPickerDataTypeDefinition.Key}"",
+         ""editorAlias"":""content"",
+         ""editorName"":""Content""
+      }}
+   }}
+]";
+
+            // act
+            var result = parser.GetLinkedEntities(value).ToList();
+
+            // assert
+            
+
+            dataTypeServiceMock.Verify(x => x.GetDataTypeDefinitionById(contentPickerDataTypeDefinition.Key), Times.Once);
+            dataTypeServiceMock.Verify(x => x.GetDataTypeDefinitionById(mediaPickerDataTypeDefinition.Key), Times.Once);
+            dataTypeServiceMock.Verify(x => x.GetDataTypeDefinitionById(rteDataTypeDefinition.Key), Times.Once);
+            dataTypeServiceMock.Verify(x => x.GetDataTypeDefinitionById(stringDataTypeDefinition.Key), Times.Once);
+
+            Assert.AreEqual(4, result.Count);
+            Assert.AreEqual(2, result.Count(x => x.LinkedEntityType == LinkedEntityType.Media));          
+            Assert.AreEqual(2, result.Count(x => x.LinkedEntityType == LinkedEntityType.Document));
+
+            Assert.IsTrue(result.Any(x => x.LinkedEntityType == LinkedEntityType.Media && x.Id == mediaPickerId));
+            Assert.IsTrue(result.Any(x => x.LinkedEntityType == LinkedEntityType.Media && x.Id == rteMediaId));
+            Assert.IsTrue(result.Any(x => x.LinkedEntityType == LinkedEntityType.Document && x.Id == rteLinkId));
+            Assert.IsTrue(result.Any(x => x.LinkedEntityType == LinkedEntityType.Document && x.Id == contentPickerId));
+        }
+    }
+}
diff --git a/Source/Our.Umbraco.Nexu.Parsers.Tests/Our.Umbraco.Nexu.Parsers.Tests.csproj b/Source/Our.Umbraco.Nexu.Parsers.Tests/Our.Umbraco.Nexu.Parsers.Tests.csproj
index 374f09a..43fb1a7 100644
--- a/Source/Our.Umbraco.Nexu.Parsers.Tests/Our.Umbraco.Nexu.Parsers.Tests.csproj
+++ b/Source/Our.Umbraco.Nexu.Parsers.Tests/Our.Umbraco.Nexu.Parsers.Tests.csproj
@@ -298,6 +298,7 @@
     <Compile Include="ActivatorServiceProvider.cs" />
     <Compile Include="BaseParserTest.cs" />
     <Compile Include="GridEditorParsers\Community\DocTypeGridEditorParserTests.cs" />
+    <Compile Include="GridEditorParsers\Community\LeBlenderGridEditorParserTests.cs" />
     <Compile Include="GridEditorParsers\Core\MediaGridEditorParserTests.cs" />
     <Compile Include="GridEditorParsers\Core\RteGridEditorParserTests.cs" />
     <Compile Include="PropertyParsers\Community\NestedContentParserTests.cs" />
diff --git a/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
index 00b299f..92ef5e2 100644
--- a/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
+++ b/Source/Our.Umbraco.Nexu.Parsers.Tests/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/Source/Our.Umbraco.Nexu.Parsers/GridEditorParsers/Community/LeBlenderGriddEditorParser.cs b/Source/Our.Umbraco.Nexu.Parsers/GridEditorParsers/Community/LeBlenderGriddEditorParser.cs
new file mode 100644
index 0000000..f0b915b
--- /dev/null
+++ b/Source/Our.Umbraco.Nexu.Parsers/GridEditorParsers/Community/LeBlenderGriddEditorParser.cs
@@ -0,0 +1,128 @@
+namespace Our.Umbraco.Nexu.Parsers.GridEditorParsers.Community
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using global::Umbraco.Core;
+    using global::Umbraco.Core.Logging;
+    using global::Umbraco.Core.Models;
+    using global::Umbraco.Core.Services;
+
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
+
+    using Our.Umbraco.Nexu.Core.Interfaces;
+    using Our.Umbraco.Nexu.Core.Models;
+    using Our.Umbraco.Nexu.Core.ObjectResolution;
+
+    /// <summary>
+    /// The le blender grid editor parser.
+    /// </summary>
+    public class LeBlenderGridEditorParser : IGridEditorParser
+    {
+
+        /// <summary>
+        /// The data type service.
+        /// </summary>
+        private readonly IDataTypeService dataTypeService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LeBlenderGridEditorParser"/> class.
+        /// </summary>
+        public LeBlenderGridEditorParser()
+        {
+            this.dataTypeService = ApplicationContext.Current.Services.DataTypeService;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LeBlenderGridEditorParser"/> class.
+        /// </summary>
+        /// <param name="dataTypeService">
+        /// The data type service.
+        /// </param>
+        public LeBlenderGridEditorParser(IDataTypeService dataTypeService)
+        {
+            this.dataTypeService = dataTypeService;
+        }
+
+        /// <summary>
+        /// Check if it is a parser for a speficic editor
+        /// </summary>
+        /// <param name="editorview">
+        /// The editor view alias as defined in grid config
+        /// </param>
+        /// <returns>
+        /// The <see cref="bool"/>.
+        /// </returns>
+        public bool IsParserFor(string editorview)
+        {
+            return editorview.Equals("/App_Plugins/LeBlender/editors/leblendereditor/LeBlendereditor.html");
+        }
+
+        /// <summary>
+        /// Gets the linked entities for this editor
+        /// </summary>
+        /// <param name="value">
+        /// The grid editor value
+        /// </param>
+        /// <returns>
+        /// The <see cref="IEnumerable{T}"/>.
+        /// </returns>
+        public IEnumerable<ILinkedEntity> GetLinkedEntities(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                return Enumerable.Empty<ILinkedEntity>();
+            }
+
+            var linkedEntities = new List<ILinkedEntity>();
+
+            try
+            {
+                var dataTypes = new Dictionary<string, IDataTypeDefinition>();
+
+                var jsonValue = JsonConvert.DeserializeObject<JArray>(value);
+
+                foreach (var item in jsonValue)
+                {
+                    foreach (JProperty field in item)
+                    {
+                        var dataTypeGuid = field.Value["dataTypeGuid"].ToString();
+
+                        IDataTypeDefinition dataType = null;
+
+                        if (dataTypes.ContainsKey(dataTypeGuid))
+                        {
+                            dataType = dataTypes[dataTypeGuid];
+                        }
+                        else
+                        {
+                            dataType =
+                                this.dataTypeService.GetDataTypeDefinitionById(
+                                    new Guid(dataTypeGuid));
+
+                            dataTypes.Add(dataTypeGuid, dataType);
+                        }
+
+                        var parser =
+                            PropertyParserResolver.Current.Parsers.FirstOrDefault(
+                                x => x.IsParserFor(dataType));
+
+                        if (parser != null)
+                        {
+                            linkedEntities.AddRange(parser.GetLinkedEntities(field.Value["value"]));
+                        }
+
+                    }
+                }
+            }
+            catch (Exception exception)
+            {
+                ApplicationContext.Current.ProfilingLogger.Logger.Error<LeBlenderGridEditorParser>("Error parsing le blender grid editor", exception);
+            }
+
+            return linkedEntities;
+        }
+    }
+}
diff --git a/Source/Our.Umbraco.Nexu.Parsers/Our.Umbraco.Nexu.Parsers.csproj b/Source/Our.Umbraco.Nexu.Parsers/Our.Umbraco.Nexu.Parsers.csproj
index a93c2ad..4cbf266 100644
--- a/Source/Our.Umbraco.Nexu.Parsers/Our.Umbraco.Nexu.Parsers.csproj
+++ b/Source/Our.Umbraco.Nexu.Parsers/Our.Umbraco.Nexu.Parsers.csproj
@@ -275,6 +275,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GridEditorParsers\Community\DocTypeGridEditorParser.cs" />
+    <Compile Include="GridEditorParsers\Community\LeBlenderGriddEditorParser.cs" />
     <Compile Include="GridEditorParsers\Core\MediaGridEditorParser.cs" />
     <Compile Include="GridEditorParsers\Core\RteGridEditorParser.cs" />
     <Compile Include="PropertyParsers\Community\NestedContentParser.cs" />
diff --git a/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs b/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
index 318bf96..e4789a7 100644
--- a/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
+++ b/Source/Our.Umbraco.Nexu.Parsers/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/appveyor.yml b/appveyor.yml
index d77c79a..c0cf24a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 os: Visual Studio 2015
 
 # Version format
-version: 1.3.0.{build}
+version: 1.4.0.{build}
 
 cache:
   - Source\packages -> **\packages.config   # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified
diff --git a/docs/introduction.md b/docs/introduction.md
index e69f4c5..b7e8173 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -37,6 +37,7 @@ In the developer section a dashboard is added that allows you to rebuild all the
 - Related links
 - Media picker
 - Multiple Media picker
+- Nested Content (v7.7+)
 
 ### Community property editors ###
 - [Nested Content](https://our.umbraco.org/projects/backoffice-extensions/nested-content/)
@@ -51,5 +52,6 @@ In the developer section a dashboard is added that allows you to rebuild all the
 
 ### Community grid editors ###
 - [Doc Type Grid Editor](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor/)
+- [LeBlender](https://our.umbraco.org/projects/backoffice-extensions/leblender/)