diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..231f0c2
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,12 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## 1.0.1 - 2018-01-07
+
+### Added
+- [CHANGELOG.md](CHANGELOG.md) file.
+
+### Fixed
+- [Issue #1](../../issues/1).
diff --git a/_recursive-map-merge.scss b/_recursive-map-merge.scss
index 6dee3c8..3192ca1 100644
--- a/_recursive-map-merge.scss
+++ b/_recursive-map-merge.scss
@@ -1,5 +1,5 @@
 @function recursive-map-merge($map1, $map2) {
-    @if (type-of($map1) == map and type-of($map2) == map) {
+    @if ((type-of($map1) == map or type-of($map1) == list) and (type-of($map2) == map or type-of($map2) == list)) {
         $result: $map1;
         @each $key, $value in $map2 {
             @if (type-of(map-get($result, $key)) == map and type-of($value) == map) {
diff --git a/package.json b/package.json
index 41f9e6b..ca7c970 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sass-recursive-map-merge",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A lightweight Sass function that merges multidimensional maps recursively.",
   "repository": {
     "type": "git",