diff --git a/src/unibit.js b/src/unibit.js
index 81332ab..8a07762 100644
--- a/src/unibit.js
+++ b/src/unibit.js
@@ -352,9 +352,9 @@ module.exports = class Unibit {
         const urlPathParts = _.split(urlPath, '/');
         return _.filter(context.site.pages, page => {
             // find all pages that have same prefix as folder path, but not the root page of that folder, e.g.: {urlPath}/index.html
-            let pageUrl = _.trim(_.get(page, 'url'), '/');
+            let pageUrl = _.trim(_.get(page, 'url'), path.sep);
             pageUrl = prettyUrl(pageUrl);
-            const pageUrlParts = _.split(pageUrl, '/');
+            const pageUrlParts = _.split(pageUrl, path.sep);
             return pageUrlParts.length > urlPathParts.length && _.isEqual(pageUrlParts.slice(0, urlPathParts.length), urlPathParts);
         });
     }
diff --git a/src/utils.js b/src/utils.js
index 1c11773..2d72665 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -3,7 +3,7 @@ const path = require('path');
 const _ = require('lodash');
 const yaml = require('js-yaml');
 const toml = require('@iarna/toml');
-
+const { EOL } = require('os');
 
 module.exports = {
     forEachPromise,
@@ -107,20 +107,20 @@ function parseMarkdownWithFrontMatter(string) {
     let frontMatterTypes = [
         {
             type: 'yaml',
-            startDelimiter: '---\n',
-            endDelimiter: '\n---',
+            startDelimiter: `---${EOL}`,
+            endDelimiter: `${EOL}---`,
             parse: (string) => yaml.safeLoad(string, {schema: yaml.JSON_SCHEMA})
         },
         {
             type: 'toml',
-            startDelimiter: '+++\n',
-            endDelimiter: '\n+++',
+            startDelimiter: `+++${EOL}`,
+            endDelimiter: `${EOL}+++`,
             parse: (string) => toml.parse(string)
         },
         {
             type: 'json',
-            startDelimiter: '{\n',
-            endDelimiter: '\n}',
+            startDelimiter: `{${EOL}`,
+            endDelimiter: `${EOL}}`,
             parse: (string) => JSON.parse(string)
         }
     ];