diff --git a/feed.xml b/feed.xml
index 96c9681..adf0d1c 100644
--- a/feed.xml
+++ b/feed.xml
@@ -1,10 +1,8 @@
---
layout: null
---
-
-
{{ site.title }}
@@ -16,13 +14,12 @@ layout: null
{% for post in site.posts %}
-
- {{ post.title }}
-
- {{ post.date | date_to_xmlschema }}
- {{ site.url }}{{ post.id }}
- {{ post.content | xml_escape }}
-
+
+ {{ post.title }}
+
+ {{ post.date | date_to_xmlschema }}
+ {{ site.url }}{{ post.id }}
+ {{ post.content | xml_escape }}
+
{% endfor %}
-
diff --git a/sitemap.xml b/sitemap.xml
index 464279b..3bd9783 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3,20 +3,28 @@ layout: null
---
-
- {{ site.url }}
-
+
+ {{ site.url }}
+ {{ site.time | date_to_xmlschema }}
+
- {% for page in site.pages %}
-
- {{ site.url }}{{ page.url }}
-
- {% endfor %}
+ {% assign pages_list = site.pages %}
+ {% for node in pages_list %}
+ {% if node.title != null and node.url != '/404.html' %}
+
+ {{ site.url }}{{ node.url }}
+
+ {% endif %}
+ {% endfor %}
- {% for post in site.posts %}
+ {% for post in site.posts %}
{{ site.url }}{{ post.url }}
- {{ post.date | date_to_xmlschema }}
+ {% if post.modified != nil %}
+ {{ post.modified | date_to_xmlschema }}
+ {% else %}
+ {{ post.date | date_to_xmlschema }}
+ {% endif %}
- {% endfor %}
+ {% endfor %}