diff --git a/challenges/camel-case/README.md b/challenges/camel-case/README.md
index b3df08f..bae8806 100644
--- a/challenges/camel-case/README.md
+++ b/challenges/camel-case/README.md
@@ -1,6 +1,6 @@
 # camel-case
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/camel-case/solutions/typescript-camelcase/README.md b/challenges/camel-case/solutions/typescript-camelcase/README.md
index 2cc3827..136f5e2 100644
--- a/challenges/camel-case/solutions/typescript-camelcase/README.md
+++ b/challenges/camel-case/solutions/typescript-camelcase/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/fibonacci-suite/README.md b/challenges/fibonacci-suite/README.md
index e4ae862..1849a41 100644
--- a/challenges/fibonacci-suite/README.md
+++ b/challenges/fibonacci-suite/README.md
@@ -1,6 +1,6 @@
 # fibonacci-suite
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/fibonacci-suite/solutions/typescript-recursive/README.md b/challenges/fibonacci-suite/solutions/typescript-recursive/README.md
index bdf4f07..af6c5d7 100644
--- a/challenges/fibonacci-suite/solutions/typescript-recursive/README.md
+++ b/challenges/fibonacci-suite/solutions/typescript-recursive/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/find-outlier-number/README.md b/challenges/find-outlier-number/README.md
index 57de44a..45f478a 100644
--- a/challenges/find-outlier-number/README.md
+++ b/challenges/find-outlier-number/README.md
@@ -1,6 +1,6 @@
 # find-outlier-number
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/find-outlier-number/solutions/typescript-outlier/README.md b/challenges/find-outlier-number/solutions/typescript-outlier/README.md
index 69eb0cb..e366dc0 100644
--- a/challenges/find-outlier-number/solutions/typescript-outlier/README.md
+++ b/challenges/find-outlier-number/solutions/typescript-outlier/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/hello-world/README.md b/challenges/hello-world/README.md
index 79b0751..891b783 100644
--- a/challenges/hello-world/README.md
+++ b/challenges/hello-world/README.md
@@ -1,6 +1,6 @@
 # hello-world
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/hello-world/solutions/javascript-hello/README.md b/challenges/hello-world/solutions/javascript-hello/README.md
index cff9f02..5c4cbd8 100644
--- a/challenges/hello-world/solutions/javascript-hello/README.md
+++ b/challenges/hello-world/solutions/javascript-hello/README.md
@@ -2,4 +2,4 @@
 
 Programming language : JavaScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/hello-world/solutions/python-hello/README.md b/challenges/hello-world/solutions/python-hello/README.md
index cb385f0..3888c8c 100644
--- a/challenges/hello-world/solutions/python-hello/README.md
+++ b/challenges/hello-world/solutions/python-hello/README.md
@@ -2,4 +2,4 @@
 
 Programming language : Python
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/hello-world/solutions/typescript-hello/README.md b/challenges/hello-world/solutions/typescript-hello/README.md
index 396813e..2be6b56 100644
--- a/challenges/hello-world/solutions/typescript-hello/README.md
+++ b/challenges/hello-world/solutions/typescript-hello/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/inventory-update/README.md b/challenges/inventory-update/README.md
index bea5333..d448b04 100644
--- a/challenges/inventory-update/README.md
+++ b/challenges/inventory-update/README.md
@@ -1,6 +1,6 @@
 # inventory-update
 
-Created by [@Divlo](https://github.com/Divlo) at 8 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 8 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/inventory-update/solutions/javascript-inventory/README.md b/challenges/inventory-update/solutions/javascript-inventory/README.md
index 180ec4a..6452d40 100644
--- a/challenges/inventory-update/solutions/javascript-inventory/README.md
+++ b/challenges/inventory-update/solutions/javascript-inventory/README.md
@@ -2,4 +2,4 @@
 
 Programming language : JavaScript
 
-Created by [@Divlo](https://github.com/Divlo) at 8 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 8 July 2020.
diff --git a/challenges/is-palindrome/README.md b/challenges/is-palindrome/README.md
index b74e865..27c87a5 100644
--- a/challenges/is-palindrome/README.md
+++ b/challenges/is-palindrome/README.md
@@ -1,6 +1,6 @@
 # is-palindrome
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/is-palindrome/solutions/typescript-palindrome/README.md b/challenges/is-palindrome/solutions/typescript-palindrome/README.md
index 7924e8f..3fb36ca 100644
--- a/challenges/is-palindrome/solutions/typescript-palindrome/README.md
+++ b/challenges/is-palindrome/solutions/typescript-palindrome/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/is-prime-number/README.md b/challenges/is-prime-number/README.md
index 2c0f0d5..aa5c073 100644
--- a/challenges/is-prime-number/README.md
+++ b/challenges/is-prime-number/README.md
@@ -1,6 +1,6 @@
 # is-prime-number
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/is-prime-number/solutions/python-prime/README.md b/challenges/is-prime-number/solutions/python-prime/README.md
index 337ea1d..561a1fa 100644
--- a/challenges/is-prime-number/solutions/python-prime/README.md
+++ b/challenges/is-prime-number/solutions/python-prime/README.md
@@ -2,4 +2,4 @@
 
 Programming language : Python
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/maskify-card-number/README.md b/challenges/maskify-card-number/README.md
index c114d8e..55a9c3a 100644
--- a/challenges/maskify-card-number/README.md
+++ b/challenges/maskify-card-number/README.md
@@ -1,6 +1,6 @@
 # maskify-card-number
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/maskify-card-number/solutions/typescript-maskify/README.md b/challenges/maskify-card-number/solutions/typescript-maskify/README.md
index 5a046a8..3aee871 100644
--- a/challenges/maskify-card-number/solutions/typescript-maskify/README.md
+++ b/challenges/maskify-card-number/solutions/typescript-maskify/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/challenges/pairwise/README.md b/challenges/pairwise/README.md
index d8265b1..f8379ef 100644
--- a/challenges/pairwise/README.md
+++ b/challenges/pairwise/README.md
@@ -1,6 +1,6 @@
 # pairwise
 
-Created by [@Divlo](https://github.com/Divlo) at 8 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 8 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/pairwise/solutions/javascript-pairwise/README.md b/challenges/pairwise/solutions/javascript-pairwise/README.md
index 57f96fa..5ec8cf2 100644
--- a/challenges/pairwise/solutions/javascript-pairwise/README.md
+++ b/challenges/pairwise/solutions/javascript-pairwise/README.md
@@ -2,4 +2,4 @@
 
 Programming language : JavaScript
 
-Created by [@Divlo](https://github.com/Divlo) at 8 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 8 July 2020.
diff --git a/challenges/sort-array-alphabet/README.md b/challenges/sort-array-alphabet/README.md
index 45263b4..dc2058d 100644
--- a/challenges/sort-array-alphabet/README.md
+++ b/challenges/sort-array-alphabet/README.md
@@ -1,6 +1,6 @@
 # sort-array-alphabet
 
-Created by [@Divlo](https://github.com/Divlo) at 7 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 7 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/sort-array-alphabet/solutions/typescript-easy-sort/README.md b/challenges/sort-array-alphabet/solutions/typescript-easy-sort/README.md
index cad7522..82ca07a 100644
--- a/challenges/sort-array-alphabet/solutions/typescript-easy-sort/README.md
+++ b/challenges/sort-array-alphabet/solutions/typescript-easy-sort/README.md
@@ -2,4 +2,4 @@
 
 Programming language : TypeScript
 
-Created by [@Divlo](https://github.com/Divlo) at 7 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 7 July 2020.
diff --git a/challenges/sort-array-number/README.md b/challenges/sort-array-number/README.md
index b79c4ce..c263279 100644
--- a/challenges/sort-array-number/README.md
+++ b/challenges/sort-array-number/README.md
@@ -1,6 +1,6 @@
 # sort-array-number
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
 
 ## Instructions :
 
diff --git a/challenges/sort-array-number/solutions/javascript-easy-sort/README.md b/challenges/sort-array-number/solutions/javascript-easy-sort/README.md
index 605f906..7b8a0ca 100644
--- a/challenges/sort-array-number/solutions/javascript-easy-sort/README.md
+++ b/challenges/sort-array-number/solutions/javascript-easy-sort/README.md
@@ -2,4 +2,4 @@
 
 Programming language : JavaScript
 
-Created by [@Divlo](https://github.com/Divlo) at 7 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 7 July 2020.
diff --git a/challenges/sort-array-number/solutions/javascript-sort/README.md b/challenges/sort-array-number/solutions/javascript-sort/README.md
index 9f96126..dde58d1 100644
--- a/challenges/sort-array-number/solutions/javascript-sort/README.md
+++ b/challenges/sort-array-number/solutions/javascript-sort/README.md
@@ -2,4 +2,4 @@
 
 Programming language : JavaScript
 
-Created by [@Divlo](https://github.com/Divlo) at 5 July 2020.
+Created by [@Divlo](https://github.com/Divlo) on 5 July 2020.
diff --git a/scripts/create-challenge.ts b/scripts/create-challenge.ts
index 4de3e62..8508bec 100644
--- a/scripts/create-challenge.ts
+++ b/scripts/create-challenge.ts
@@ -74,7 +74,7 @@ import date from 'date-and-time'
   await replaceInFile({
     files: [readmePath],
     from: /{{ challengeInfo }}/g,
-    to: `Created${(userGitHub !== '') ? ` by [@${userGitHub}](https://github.com/${userGitHub})` : ''} at ${date.format(new Date(), 'D MMMM Y', true)}.`
+    to: `Created${(userGitHub !== '') ? ` by [@${userGitHub}](https://github.com/${userGitHub})` : ''} on ${date.format(new Date(), 'D MMMM Y', true)}.`
   })
 
   console.log(`
diff --git a/scripts/create-solution.ts b/scripts/create-solution.ts
index c302ec3..b7ab6bc 100644
--- a/scripts/create-solution.ts
+++ b/scripts/create-solution.ts
@@ -96,7 +96,7 @@ import copyDirPromise from './utils/copyDirPromise'
   })
 
   // Replace {{ solutionInfo }} in README.md
-  const createdByString = `Created${(userGitHub !== '') ? ` by [@${userGitHub}](https://github.com/${userGitHub})` : ''} at ${date.format(new Date(), 'D MMMM Y', true)}.`
+  const createdByString = `Created${(userGitHub !== '') ? ` by [@${userGitHub}](https://github.com/${userGitHub})` : ''} on ${date.format(new Date(), 'D MMMM Y', true)}.`
   await replaceInFile({
     files: [readmePath],
     from: /{{ solutionInfo }}/g,