diff --git a/.circleci/config.yml b/.circleci/config.yml
index f5b7051..3f16f92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,63 +3,62 @@
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 #
 version: 2.1
+orbs:
+  ruby: circleci/ruby@0.2.2
 
-shared: &shared
+shared_steps: &shared_steps
   steps:
+    - run: ruby -v
     - checkout
+    - ruby/load-cache
+    - run: gem install bundler:2.1.4
+    - ruby/install-deps
+    - ruby/save-cache
+    - ruby/run-tests
 
-    - run:
-        name: Install dependencies
-        command: |
-          bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-    - run:
-        name: Run rubocop
-        command: |
-          bundle exec rubocop
+jobs:
+  lint:
+    environment:
+      BUNDLE_PATH: vendor/bundle
+    executor: ruby/default
+    steps:
+      - run: ruby -v
+      - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - run: bundle exec rubocop
 
-    - run:
-        name: Run tests
-        command: |
-          bundle exec rspec --color --require spec_helper spec --format progress
+  test:
+    parameters:
+      tag:
+        type: string
+    environment:
+      BUNDLE_PATH: vendor/bundle
+    executor:
+      name: ruby/default
+      tag: << parameters.tag >>
+    parallelism: 1
+    <<: *shared_steps
 
-jobs:
-  "ruby-23":
-    <<: *shared
-    docker:
-      - image: circleci/ruby:2.3-node-browsers
-  "ruby-24":
-    <<: *shared
-    docker:
-      - image: circleci/ruby:2.4-node-browsers
-  "ruby-25":
-    <<: *shared
-    docker:
-      - image: circleci/ruby:2.5-node-browsers
-  "ruby-26":
-    <<: *shared
-    docker:
-      - image: circleci/ruby:2.6-node-browsers
-  "jruby-91":
-    <<: *shared
-    docker:
-      - image: circleci/jruby:9.1-jdk
-        environment:
-          JRUBY_OPTS: "--debug"
-  "jruby-92":
-    <<: *shared
+  test_jruby:
+    environment:
+      BUNDLE_PATH: vendor/bundle
+      JRUBY_OPTS: "--debug"
     docker:
-      - image: circleci/jruby:9.2-jdk
-        environment:
-          JRUBY_OPTS: "--debug"
+      - image: circleci/jruby:9.2
+    <<: *shared_steps
 
 workflows:
   version: 2
   build:
     jobs:
-      - "ruby-23"
-      - "ruby-24"
-      - "ruby-25"
-      - "ruby-26"
-      - "jruby-91"
-      - "jruby-92"
+      - lint
+      - test_jruby:
+          requires:
+            - lint
+      - test:
+          matrix:
+            parameters:
+              tag: ["2.5", "2.6", "2.7"]
+          requires:
+            - lint
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..dd84ea7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..bbcbbe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github_changelog_generator b/.github_changelog_generator
index 6d1dea2..988ad8f 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,2 +1,3 @@
 project=github-changelog-generator
 user=github-changelog-generator
+exclude-labels=duplicate,question,invalid,wontfix,weekly-digest
diff --git a/.gitignore b/.gitignore
index cd248d3..fdf2a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,8 @@ bin/*
 pkg/
 coverage/
 .bundle
-spec/*.lock
 doc
 .yardoc
-Gemfile.lock
-gemfiles/Gemfile.2_4_0.lock
-gemfiles/Gemfile.jruby-9.1.5.0.lock
-.idea/
 github-changelog-generator.iml
 github_changelog_generator-*.gem
 vendor/
diff --git a/.rubocop.yml b/.rubocop.yml
index 84dafb8..fef33b6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,36 +2,52 @@ inherit_from: .rubocop_todo.yml
 require: rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   DisplayStyleGuide: true
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
 Performance/RegexpMatch:
   Enabled: false
 
-#http://viget.com/extend/just-use-double-quoted-ruby-strings
+Style/ExponentialNotation:
+  Enabled: true
+
+# http://viget.com/extend/just-use-double-quoted-ruby-strings
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-    Enabled: false
+  Enabled: false
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-    Enabled: false
+  Enabled: false
 
-Naming/FileName:
+Metrics/ModuleLength:
     Exclude:
-      - 'bin/git-generate-changelog'
+      - 'spec/**/*'
 
-#TODOS
+Naming/FileName:
+  Exclude:
+    - 'bin/git-generate-changelog'
+
+# TODOS
 # Offense count: 14
 Metrics/AbcSize:
   Enabled: false
@@ -64,7 +80,7 @@ Style/RegexpLiteral:
   Enabled: false
 
 Style/MutableConstant:
-    Enabled: false
+  Enabled: false
 
 # "Use idx.positive? instead of idx > 0."
 Style/NumericPredicate:
@@ -81,6 +97,12 @@ Metrics/BlockLength:
 Lint/InterpolationCheck:
   Enabled: false
 
+Lint/DeprecatedOpenSSLConstant: # (0.84)
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes: # (0.85)
+  Enabled: true
+
 Style/FormatStringToken:
   Exclude:
     - lib/github_changelog_generator/parser.rb
@@ -88,3 +110,114 @@ Style/FormatStringToken:
 Style/MixinUsage:
   Exclude:
     - lib/github_changelog_generator/task.rb
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass: # (0.85)
+  Enabled: true
+
+Style/RedundantRegexpEscape: # (0.85)
+  Enabled: true
+
+
+Layout/BeginEndAlignment: # (new in 0.91)
+  Enabled: true
+Lint/BinaryOperatorWithIdenticalOperands: # (new in 0.89)
+  Enabled: true
+Lint/ConstantDefinitionInBlock: # (new in 0.91)
+  Enabled: true
+Lint/DuplicateElsifCondition: # (new in 0.88)
+  Enabled: true
+Lint/DuplicateRequire: # (new in 0.90)
+  Enabled: true
+Lint/DuplicateRescueException: # (new in 0.89)
+  Enabled: true
+Lint/EmptyConditionalBody: # (new in 0.89)
+  Enabled: true
+Lint/EmptyFile: # (new in 0.90)
+  Enabled: true
+Lint/FloatComparison: # (new in 0.89)
+  Enabled: true
+Lint/IdentityComparison: # (new in 0.91)
+  Enabled: true
+Lint/MissingSuper: # (new in 0.89)
+  Enabled: true
+Lint/OutOfRangeRegexpRef: # (new in 0.89)
+  Enabled: true
+Lint/SelfAssignment: # (new in 0.89)
+  Enabled: true
+Lint/TopLevelReturnWithArgument: # (new in 0.89)
+  Enabled: true
+Lint/TrailingCommaInAttributeDeclaration: # (new in 0.90)
+  Enabled: true
+Lint/UnreachableLoop: # (new in 0.89)
+  Enabled: true
+Lint/UselessMethodDefinition: # (new in 0.90)
+  Enabled: true
+Lint/UselessTimes: # (new in 0.91)
+  Enabled: true
+Style/AccessorGrouping: # (new in 0.87)
+  Enabled: true
+Style/BisectedAttrAccessor: # (new in 0.87)
+  Enabled: true
+Style/CaseLikeIf: # (new in 0.88)
+  Enabled: true
+Style/CombinableLoops: # (new in 0.90)
+  Enabled: true
+Style/ExplicitBlockArgument: # (new in 0.89)
+  Enabled: true
+Style/GlobalStdStream: # (new in 0.89)
+  Enabled: true
+Style/HashAsLastArrayItem: # (new in 0.88)
+  Enabled: true
+Style/HashLikeCase: # (new in 0.88)
+  Enabled: true
+Style/KeywordParametersOrder: # (new in 0.90)
+  Enabled: true
+Style/OptionalBooleanParameter: # (new in 0.89)
+  Enabled: true
+Style/RedundantAssignment: # (new in 0.87)
+  Enabled: true
+Style/RedundantFetchBlock: # (new in 0.86)
+  Enabled: true
+Style/RedundantFileExtensionInRequire: # (new in 0.88)
+  Enabled: true
+Style/RedundantSelfAssignment: # (new in 0.90)
+  Enabled: true
+Style/SingleArgumentDig: # (new in 0.89)
+  Enabled: true
+Style/SoleNestedConditional: # (new in 0.89)
+  Enabled: true
+Style/StringConcatenation: # (new in 0.89)
+  Enabled: true
+Performance/AncestorsInclude: # (new in 1.7)
+  Enabled: true
+Performance/BigDecimalWithNumericArgument: # (new in 1.7)
+  Enabled: true
+Performance/RedundantSortBlock: # (new in 1.7)
+  Enabled: true
+Performance/RedundantStringChars: # (new in 1.7)
+  Enabled: true
+Performance/ReverseFirst: # (new in 1.7)
+  Enabled: true
+Performance/SortReverse: # (new in 1.7)
+  Enabled: true
+Performance/Squeeze: # (new in 1.7)
+  Enabled: true
+Performance/StringInclude: # (new in 1.7)
+  Enabled: true
+Performance/Sum: # (new in 1.8)
+  Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 99b336e..e1e9579 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,15 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-09-30 23:56:15 +0200 using RuboCop version 0.43.0.
+# on 2020-09-26 17:49:16 UTC using RuboCop version 0.92.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
+# Offense count: 4
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 10
 
-# Offense count: 2
+# Offense count: 4
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 11
diff --git a/.ruby-version b/.ruby-version
index 097a15a..860487c 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.2
+2.7.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82f8959..df611f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,67 @@
-# Change Log
+# Changelog
 
-## [1.15.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.15.0) (2019-10-05)
+## [Unreleased](https://github.com/github-changelog-generator/github-changelog-generator/tree/HEAD)
 
-[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/v1.15.0.pre.rc...1.15.0)
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/v1.15.2...HEAD)
+
+**Implemented enhancements:**
+
+- Add no-http-cache option to rake task [\#739](https://github.com/github-changelog-generator/github-changelog-generator/pull/739) ([mcelicalderon](https://github.com/mcelicalderon))
+
+**Fixed bugs:**
+
+- Fix not parsing body\_only param for sections [\#755](https://github.com/github-changelog-generator/github-changelog-generator/pull/755) ([dusan-dragon](https://github.com/dusan-dragon))
+- Bugfix: undefined method line\_labels\_for [\#753](https://github.com/github-changelog-generator/github-changelog-generator/pull/753) ([dusan-dragon](https://github.com/dusan-dragon))
+
+**Closed issues:**
+
+- Nondeterministic moving/deleting of PRs in CHANGELOG.md [\#774](https://github.com/github-changelog-generator/github-changelog-generator/issues/774)
+
+**Merged pull requests:**
+
+- Tell the truth in this comment [\#792](https://github.com/github-changelog-generator/github-changelog-generator/pull/792) ([olleolleolle](https://github.com/olleolleolle))
+- Bump backports from 3.17.0 to 3.17.1 [\#788](https://github.com/github-changelog-generator/github-changelog-generator/pull/788) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Drop support for EOL Ruby versions [\#786](https://github.com/github-changelog-generator/github-changelog-generator/pull/786) ([olleolleolle](https://github.com/olleolleolle))
+- chore: RuboCop: Add more Cop names as enabled [\#785](https://github.com/github-changelog-generator/github-changelog-generator/pull/785) ([olleolleolle](https://github.com/olleolleolle))
+- Use `async-http-faraday`. [\#784](https://github.com/github-changelog-generator/github-changelog-generator/pull/784) ([ioquatix](https://github.com/ioquatix))
+- chore: Use MRI 2.7.1 in development [\#783](https://github.com/github-changelog-generator/github-changelog-generator/pull/783) ([olleolleolle](https://github.com/olleolleolle))
+- CI: Ruby 2.3, Ruby 2.4 hold at ActiveSupport \< 6 [\#782](https://github.com/github-changelog-generator/github-changelog-generator/pull/782) ([olleolleolle](https://github.com/olleolleolle))
+- CI: JRuby 9.1 support: hold ActiveSupport at 5.x, introduce gemfiles/ directory [\#780](https://github.com/github-changelog-generator/github-changelog-generator/pull/780) ([olleolleolle](https://github.com/olleolleolle))
+- Fixing bug when filtering pull requests without labels [\#771](https://github.com/github-changelog-generator/github-changelog-generator/pull/771) ([douglasmiller](https://github.com/douglasmiller))
+
+## [v1.15.2](https://github.com/github-changelog-generator/github-changelog-generator/tree/v1.15.2) (2020-04-07)
+
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/v1.15.1...v1.15.2)
+
+**Merged pull requests:**
+
+- Put back bin files [\#779](https://github.com/github-changelog-generator/github-changelog-generator/pull/779) ([skywinder](https://github.com/skywinder))
+
+## [v1.15.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/v1.15.1) (2020-04-05)
+
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/v1.15.0...v1.15.1)
+
+**Implemented enhancements:**
+
+- Releasing 1.15.0 [\#728](https://github.com/github-changelog-generator/github-changelog-generator/issues/728)
+- Partial updates / add missing versions [\#209](https://github.com/github-changelog-generator/github-changelog-generator/issues/209)
+- Minor grammar fix [\#765](https://github.com/github-changelog-generator/github-changelog-generator/pull/765) ([cachedout](https://github.com/cachedout))
+
+**Closed issues:**
+
+- Warning about Project\_card\_events API [\#773](https://github.com/github-changelog-generator/github-changelog-generator/issues/773)
+- To improve build\_url method in Locust HttpSession [\#744](https://github.com/github-changelog-generator/github-changelog-generator/issues/744)
+- uninitialized constant Faraday::Error::ClientError \(NameError\) [\#741](https://github.com/github-changelog-generator/github-changelog-generator/issues/741)
+- TypeError: no implicit conversion of nil into Array [\#738](https://github.com/github-changelog-generator/github-changelog-generator/issues/738)
+- bundler 1.14.3 issue with  uninitalized constant [\#474](https://github.com/github-changelog-generator/github-changelog-generator/issues/474)
+
+**Merged pull requests:**
+
+- fix: disable preview api warning from octokit.rb [\#777](https://github.com/github-changelog-generator/github-changelog-generator/pull/777) ([digglife](https://github.com/digglife))
+
+## [v1.15.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/v1.15.0) (2019-10-05)
+
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/v1.15.0.pre.rc...v1.15.0)
 
 **Implemented enhancements:**
 
@@ -14,7 +73,6 @@
 - 588 : Added new line after credits [\#627](https://github.com/github-changelog-generator/github-changelog-generator/pull/627) ([qwerty2323](https://github.com/qwerty2323))
 - Support printing changelog to stdout [\#624](https://github.com/github-changelog-generator/github-changelog-generator/pull/624) ([sue445](https://github.com/sue445))
 - Fix unlabeled, mixed labels, and unmapped labels handling [\#618](https://github.com/github-changelog-generator/github-changelog-generator/pull/618) ([hunner](https://github.com/hunner))
-- Implemented a Dockerfile [\#592](https://github.com/github-changelog-generator/github-changelog-generator/pull/592) ([ferrarimarco](https://github.com/ferrarimarco))
 - Make 'change log' a single word [\#579](https://github.com/github-changelog-generator/github-changelog-generator/pull/579) ([mesaugat](https://github.com/mesaugat))
 
 **Fixed bugs:**
@@ -47,7 +105,6 @@
 - Can we exclude closed Requests [\#632](https://github.com/github-changelog-generator/github-changelog-generator/issues/632)
 - Version in master branch hangs on MacOS [\#629](https://github.com/github-changelog-generator/github-changelog-generator/issues/629)
 - Some PRs logged for the wrong releases [\#617](https://github.com/github-changelog-generator/github-changelog-generator/issues/617)
-- Is there way to list referenced but not closed issues? [\#609](https://github.com/github-changelog-generator/github-changelog-generator/issues/609)
 - since\_tag with unreleased tag unexpected behavior [\#604](https://github.com/github-changelog-generator/github-changelog-generator/issues/604)
 - Generator doesn't work when I run the command presented in the docs [\#599](https://github.com/github-changelog-generator/github-changelog-generator/issues/599)
 - Move repo to organisation [\#595](https://github.com/github-changelog-generator/github-changelog-generator/issues/595)
@@ -111,6 +168,7 @@
 
 **Implemented enhancements:**
 
+- Implemented a Dockerfile [\#592](https://github.com/github-changelog-generator/github-changelog-generator/pull/592) ([ferrarimarco](https://github.com/ferrarimarco))
 - Add option --require to load custom Ruby code before starting [\#574](https://github.com/github-changelog-generator/github-changelog-generator/pull/574) ([olleolleolle](https://github.com/olleolleolle))
 
 **Fixed bugs:**
@@ -123,6 +181,7 @@
 - Aborting on missing --user and --project prints all of usage [\#578](https://github.com/github-changelog-generator/github-changelog-generator/pull/578) ([olleolleolle](https://github.com/olleolleolle))
 - Options\#print\_options + API docs for Options, Parser [\#576](https://github.com/github-changelog-generator/github-changelog-generator/pull/576) ([olleolleolle](https://github.com/olleolleolle))
 - \[docs\] Contributing file [\#575](https://github.com/github-changelog-generator/github-changelog-generator/pull/575) ([olleolleolle](https://github.com/olleolleolle))
+- OctoFetcher: Use defaults for request\_options [\#571](https://github.com/github-changelog-generator/github-changelog-generator/pull/571) ([olleolleolle](https://github.com/olleolleolle))
 
 ## [v1.15.0.pre.beta](https://github.com/github-changelog-generator/github-changelog-generator/tree/v1.15.0.pre.beta) (2017-10-13)
 
@@ -130,7 +189,6 @@
 
 **Implemented enhancements:**
 
-- add breaking-changes section to changelog [\#530](https://github.com/github-changelog-generator/github-changelog-generator/pull/530) ([bastelfreak](https://github.com/bastelfreak))
 - Drop Project-and-Username-finding code [\#451](https://github.com/github-changelog-generator/github-changelog-generator/pull/451) ([olleolleolle](https://github.com/olleolleolle))
 
 **Fixed bugs:**
@@ -146,7 +204,6 @@
 **Merged pull requests:**
 
 - Fix regression w/ enhancements in issues\_to\_log [\#573](https://github.com/github-changelog-generator/github-changelog-generator/pull/573) ([ekohl](https://github.com/ekohl))
-- OctoFetcher: Use defaults for request\_options [\#571](https://github.com/github-changelog-generator/github-changelog-generator/pull/571) ([olleolleolle](https://github.com/olleolleolle))
 - OctoFetcher: extract methods [\#570](https://github.com/github-changelog-generator/github-changelog-generator/pull/570) ([olleolleolle](https://github.com/olleolleolle))
 - OctoFetcher: extract method fail\_with\_message [\#569](https://github.com/github-changelog-generator/github-changelog-generator/pull/569) ([olleolleolle](https://github.com/olleolleolle))
 - OctoFetcher: drop unused number\_of\_pages feature [\#568](https://github.com/github-changelog-generator/github-changelog-generator/pull/568) ([olleolleolle](https://github.com/olleolleolle))
@@ -161,6 +218,7 @@
 **Implemented enhancements:**
 
 - Add newline after version name and Full Changelog link [\#548](https://github.com/github-changelog-generator/github-changelog-generator/pull/548) ([ianroberts131](https://github.com/ianroberts131))
+- add breaking-changes section to changelog [\#530](https://github.com/github-changelog-generator/github-changelog-generator/pull/530) ([bastelfreak](https://github.com/bastelfreak))
 - Update the token failure example to OctoKit 404 failure [\#525](https://github.com/github-changelog-generator/github-changelog-generator/pull/525) ([0xalexdelgado](https://github.com/0xalexdelgado))
 - Rescue invalid commands and present the valid options list [\#498](https://github.com/github-changelog-generator/github-changelog-generator/pull/498) ([Lucashuang0802](https://github.com/Lucashuang0802))
 - bundled cacert.pem with --ssl-ca-file PATH option [\#480](https://github.com/github-changelog-generator/github-changelog-generator/pull/480) ([olleolleolle](https://github.com/olleolleolle))
@@ -353,7 +411,6 @@
 
 - Ability to implicity set user and project from command line [\#401](https://github.com/github-changelog-generator/github-changelog-generator/pull/401) ([skywinder](https://github.com/skywinder))
 - Show how to use it with Rakefile [\#399](https://github.com/github-changelog-generator/github-changelog-generator/pull/399) ([edusantana](https://github.com/edusantana))
-- Adds documentation on using a GHE endpoint [\#396](https://github.com/github-changelog-generator/github-changelog-generator/pull/396) ([cormacmccarthy](https://github.com/cormacmccarthy))
 - Rake task usage: Added a missing option exclude\_tags\_regex [\#393](https://github.com/github-changelog-generator/github-changelog-generator/pull/393) ([perlun](https://github.com/perlun))
 - Parser: YARD docstrings and a rename, and RegExp named capture groups [\#391](https://github.com/github-changelog-generator/github-changelog-generator/pull/391) ([olleolleolle](https://github.com/olleolleolle))
 
@@ -363,6 +420,7 @@
 
 **Merged pull requests:**
 
+- Adds documentation on using a GHE endpoint [\#396](https://github.com/github-changelog-generator/github-changelog-generator/pull/396) ([cormacmccarthy](https://github.com/cormacmccarthy))
 - Carry PR \#301: usernames\_as\_github\_logins [\#392](https://github.com/github-changelog-generator/github-changelog-generator/pull/392) ([olleolleolle](https://github.com/olleolleolle))
 
 ## [1.12.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.12.1) (2016-05-09)
@@ -593,10 +651,6 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.8.4...1.8.5)
 
-**Fixed bugs:**
-
-- Sending OATH through -t fails [\#274](https://github.com/github-changelog-generator/github-changelog-generator/issues/274)
-
 **Merged pull requests:**
 
 - Rake task: Be able to set false value in config [\#279](https://github.com/github-changelog-generator/github-changelog-generator/pull/279) ([olleolleolle](https://github.com/olleolleolle))
@@ -605,13 +659,13 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.8.3...1.8.4)
 
-## [1.8.3](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.8.3) (2015-08-31)
+**Fixed bugs:**
 
-[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.8.2...1.8.3)
+- Sending OATH through -t fails [\#274](https://github.com/github-changelog-generator/github-changelog-generator/issues/274)
 
-**Closed issues:**
+## [1.8.3](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.8.3) (2015-08-31)
 
-- Output should not include security information [\#270](https://github.com/github-changelog-generator/github-changelog-generator/issues/270)
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.8.2...1.8.3)
 
 **Merged pull requests:**
 
@@ -621,6 +675,10 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.8.1...1.8.2)
 
+**Closed issues:**
+
+- Output should not include security information [\#270](https://github.com/github-changelog-generator/github-changelog-generator/issues/270)
+
 **Merged pull requests:**
 
 - This PRi will fix \#274. [\#275](https://github.com/github-changelog-generator/github-changelog-generator/pull/275) ([skywinder](https://github.com/skywinder))
@@ -645,8 +703,6 @@
 **Implemented enhancements:**
 
 - Generate change log since/due specific tag [\#254](https://github.com/github-changelog-generator/github-changelog-generator/issues/254)
-- Custom header [\#251](https://github.com/github-changelog-generator/github-changelog-generator/issues/251)
-- Arbitrary templates [\#242](https://github.com/github-changelog-generator/github-changelog-generator/issues/242)
 - Add --base option [\#258](https://github.com/github-changelog-generator/github-changelog-generator/pull/258) ([raphink](https://github.com/raphink))
 
 **Merged pull requests:**
@@ -661,17 +717,18 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.6.2...1.7.0)
 
-**Fixed bugs:**
+**Implemented enhancements:**
 
-- --unreleased-only broken [\#250](https://github.com/github-changelog-generator/github-changelog-generator/issues/250)
+- Custom header [\#251](https://github.com/github-changelog-generator/github-changelog-generator/issues/251)
+- Arbitrary templates [\#242](https://github.com/github-changelog-generator/github-changelog-generator/issues/242)
 
 ## [1.6.2](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.6.2) (2015-07-16)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.6.1...1.6.2)
 
-**Implemented enhancements:**
+**Fixed bugs:**
 
-- Ability to specify custom section header [\#241](https://github.com/github-changelog-generator/github-changelog-generator/issues/241)
+- --unreleased-only broken [\#250](https://github.com/github-changelog-generator/github-changelog-generator/issues/250)
 
 ## [1.6.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.6.1) (2015-06-12)
 
@@ -679,13 +736,11 @@
 
 **Implemented enhancements:**
 
-- Issues with any label  except "bug", "enhancement" should not be excluded by default. [\#240](https://github.com/github-changelog-generator/github-changelog-generator/issues/240)
-- Add ability to specify custom labels for enhancements & bugfixes [\#54](https://github.com/github-changelog-generator/github-changelog-generator/issues/54)
+- Ability to specify custom section header [\#241](https://github.com/github-changelog-generator/github-changelog-generator/issues/241)
 
 **Fixed bugs:**
 
 - not encapsulated character `\<` [\#249](https://github.com/github-changelog-generator/github-changelog-generator/issues/249)
-- --user and --project options are broken [\#246](https://github.com/github-changelog-generator/github-changelog-generator/issues/246)
 
 ## [1.6.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.6.0) (2015-06-11)
 
@@ -693,12 +748,12 @@
 
 **Implemented enhancements:**
 
-- Show `Unreleased` section even when there is no tags in repo. [\#228](https://github.com/github-changelog-generator/github-changelog-generator/issues/228)
-- Add option `--exclude-tags x,y,z` [\#214](https://github.com/github-changelog-generator/github-changelog-generator/issues/214)
-- Generate change log between 2 specific tags [\#172](https://github.com/github-changelog-generator/github-changelog-generator/issues/172)
+- Issues with any label  except "bug", "enhancement" should not be excluded by default. [\#240](https://github.com/github-changelog-generator/github-changelog-generator/issues/240)
+- Add ability to specify custom labels for enhancements & bugfixes [\#54](https://github.com/github-changelog-generator/github-changelog-generator/issues/54)
 
 **Fixed bugs:**
 
+- --user and --project options are broken [\#246](https://github.com/github-changelog-generator/github-changelog-generator/issues/246)
 - Exclude and Include tags is broken [\#245](https://github.com/github-changelog-generator/github-changelog-generator/issues/245)
 
 ## [1.5.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.5.0) (2015-05-26)
@@ -707,17 +762,14 @@
 
 **Implemented enhancements:**
 
+- Show `Unreleased` section even when there is no tags in repo. [\#228](https://github.com/github-changelog-generator/github-changelog-generator/issues/228)
+- Add option `--exclude-tags x,y,z` [\#214](https://github.com/github-changelog-generator/github-changelog-generator/issues/214)
+- Generate change log between 2 specific tags [\#172](https://github.com/github-changelog-generator/github-changelog-generator/issues/172)
 - Yanked releases support [\#53](https://github.com/github-changelog-generator/github-changelog-generator/issues/53)
 
-**Fixed bugs:**
-
-- github\_changelog\_generator.rb:220:in ``': No such file or directory - pwd \(Errno::ENOENT\) [\#237](https://github.com/github-changelog-generator/github-changelog-generator/issues/237)
-- Exclude closed \(not merged\) PR's from changelog. [\#69](https://github.com/github-changelog-generator/github-changelog-generator/issues/69)
-
 **Merged pull requests:**
 
 - Big refactoring [\#243](https://github.com/github-changelog-generator/github-changelog-generator/pull/243) ([skywinder](https://github.com/skywinder))
-- Wrap GitHub requests in function check\_github\_response [\#238](https://github.com/github-changelog-generator/github-changelog-generator/pull/238) ([skywinder](https://github.com/skywinder))
 
 ## [1.4.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.4.1) (2015-05-19)
 
@@ -729,10 +781,13 @@
 
 **Fixed bugs:**
 
+- github\_changelog\_generator.rb:220:in ``': No such file or directory - pwd \(Errno::ENOENT\) [\#237](https://github.com/github-changelog-generator/github-changelog-generator/issues/237)
 - Doesnot generator changelog [\#235](https://github.com/github-changelog-generator/github-changelog-generator/issues/235)
+- Exclude closed \(not merged\) PR's from changelog. [\#69](https://github.com/github-changelog-generator/github-changelog-generator/issues/69)
 
 **Merged pull requests:**
 
+- Wrap GitHub requests in function check\_github\_response [\#238](https://github.com/github-changelog-generator/github-changelog-generator/pull/238) ([skywinder](https://github.com/skywinder))
 - Add fetch token tests [\#236](https://github.com/github-changelog-generator/github-changelog-generator/pull/236) ([skywinder](https://github.com/skywinder))
 - Add future release option [\#231](https://github.com/github-changelog-generator/github-changelog-generator/pull/231) ([sildur](https://github.com/sildur))
 
@@ -763,10 +818,6 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.10...1.3.11)
 
-**Fixed bugs:**
-
-- Fix termination in case of empty unreleased section with `--unreleased-only` option. [\#70](https://github.com/github-changelog-generator/github-changelog-generator/pull/70) ([skywinder](https://github.com/skywinder))
-
 **Merged pull requests:**
 
 - Add  fallback with warning message to prevent crash in case of exceed API Rate Limit \(temporary workaround for \#71\) [\#75](https://github.com/github-changelog-generator/github-changelog-generator/pull/75) ([skywinder](https://github.com/skywinder))
@@ -775,6 +826,14 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.9...1.3.10)
 
+**Fixed bugs:**
+
+- Fix termination in case of empty unreleased section with `--unreleased-only` option. [\#70](https://github.com/github-changelog-generator/github-changelog-generator/pull/70) ([skywinder](https://github.com/skywinder))
+
+## [1.3.9](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.9) (2015-03-06)
+
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.8...1.3.9)
+
 **Implemented enhancements:**
 
 - Improve method of detecting owner and repository [\#63](https://github.com/github-changelog-generator/github-changelog-generator/issues/63)
@@ -783,10 +842,6 @@
 
 - Resolved concurrency problem in case of issues \> 2048 [\#65](https://github.com/github-changelog-generator/github-changelog-generator/pull/65) ([skywinder](https://github.com/skywinder))
 
-## [1.3.9](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.9) (2015-03-06)
-
-[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.8...1.3.9)
-
 ## [1.3.8](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.8) (2015-03-05)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.6...1.3.8)
@@ -795,29 +850,25 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.5...1.3.6)
 
-**Fixed bugs:**
-
-- Pull Requests in Wrong Tag [\#60](https://github.com/github-changelog-generator/github-changelog-generator/issues/60)
-
 ## [1.3.5](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.5) (2015-03-04)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.4...1.3.5)
 
 **Fixed bugs:**
 
-- --no-issues appears to break PRs [\#59](https://github.com/github-changelog-generator/github-changelog-generator/issues/59)
+- Pull Requests in Wrong Tag [\#60](https://github.com/github-changelog-generator/github-changelog-generator/issues/60)
 
 ## [1.3.4](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.4) (2015-03-03)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.3...1.3.4)
 
-## [1.3.3](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.3) (2015-03-03)
+**Fixed bugs:**
 
-[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.2...1.3.3)
+- --no-issues appears to break PRs [\#59](https://github.com/github-changelog-generator/github-changelog-generator/issues/59)
 
-**Fixed bugs:**
+## [1.3.3](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.3) (2015-03-03)
 
-- generation failed if github commit api return `404 Not Found` [\#57](https://github.com/github-changelog-generator/github-changelog-generator/issues/57)
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.2...1.3.3)
 
 **Closed issues:**
 
@@ -827,14 +878,13 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.1...1.3.2)
 
-## [1.3.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.1) (2015-02-27)
+**Fixed bugs:**
 
-[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.0...1.3.1)
+- generation failed if github commit api return `404 Not Found` [\#57](https://github.com/github-changelog-generator/github-changelog-generator/issues/57)
 
-**Implemented enhancements:**
+## [1.3.1](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.1) (2015-02-27)
 
-- Do not show `Unreleased` section, when it's empty. [\#55](https://github.com/github-changelog-generator/github-changelog-generator/issues/55)
-- Separate by lists: Enhancements, Bugs, Pull requests. [\#31](https://github.com/github-changelog-generator/github-changelog-generator/issues/31)
+[Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.3.0...1.3.1)
 
 ## [1.3.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.3.0) (2015-02-26)
 
@@ -842,17 +892,15 @@
 
 **Implemented enhancements:**
 
+- Do not show `Unreleased` section, when it's empty. [\#55](https://github.com/github-changelog-generator/github-changelog-generator/issues/55)
 - Separate list exclude and include labels [\#52](https://github.com/github-changelog-generator/github-changelog-generator/issues/52)
 - Unreleased issues in separate section [\#47](https://github.com/github-changelog-generator/github-changelog-generator/issues/47)
+- Separate by lists: Enhancements, Bugs, Pull requests. [\#31](https://github.com/github-changelog-generator/github-changelog-generator/issues/31)
 
 **Fixed bugs:**
 
 - Pull request with invalid label \(\#26\) in changelog appeared. [\#44](https://github.com/github-changelog-generator/github-changelog-generator/issues/44)
 
-**Closed issues:**
-
-- Bugs, that closed simultaneously with push not appeared in correct version. [\#37](https://github.com/github-changelog-generator/github-changelog-generator/issues/37)
-
 **Merged pull requests:**
 
 - Implement filtering of Pull Requests by milestones [\#50](https://github.com/github-changelog-generator/github-changelog-generator/pull/50) ([skywinder](https://github.com/skywinder))
@@ -861,6 +909,10 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.2.7...1.2.8)
 
+**Closed issues:**
+
+- Bugs, that closed simultaneously with push not appeared in correct version. [\#37](https://github.com/github-changelog-generator/github-changelog-generator/issues/37)
+
 **Merged pull requests:**
 
 - Feature/fix 37 [\#49](https://github.com/github-changelog-generator/github-changelog-generator/pull/49) ([skywinder](https://github.com/skywinder))
@@ -900,25 +952,18 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.2.3...1.2.4)
 
-**Implemented enhancements:**
-
-- Add ability to run with one parameter instead -u -p [\#38](https://github.com/github-changelog-generator/github-changelog-generator/issues/38)
-
 **Fixed bugs:**
 
 - Sometimes user is NULL during merges [\#41](https://github.com/github-changelog-generator/github-changelog-generator/issues/41)
 - Crash when try generate log for rails [\#35](https://github.com/github-changelog-generator/github-changelog-generator/issues/35)
 
-**Merged pull requests:**
-
-- Implement async fetching [\#39](https://github.com/github-changelog-generator/github-changelog-generator/pull/39) ([skywinder](https://github.com/skywinder))
-
 ## [1.2.3](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.2.3) (2014-12-16)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.2.2...1.2.3)
 
 **Implemented enhancements:**
 
+- Add ability to run with one parameter instead -u -p [\#38](https://github.com/github-changelog-generator/github-changelog-generator/issues/38)
 - Detailed output [\#33](https://github.com/github-changelog-generator/github-changelog-generator/issues/33)
 
 **Fixed bugs:**
@@ -927,6 +972,7 @@
 
 **Merged pull requests:**
 
+- Implement async fetching [\#39](https://github.com/github-changelog-generator/github-changelog-generator/pull/39) ([skywinder](https://github.com/skywinder))
 - Fix crash when user is NULL [\#40](https://github.com/github-changelog-generator/github-changelog-generator/pull/40) ([skywinder](https://github.com/skywinder))
 
 ## [1.2.2](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.2.2) (2014-12-10)
@@ -1008,10 +1054,6 @@
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/1.0.0...1.0.1)
 
-**Implemented enhancements:**
-
-- Implement support of different tags. [\#8](https://github.com/github-changelog-generator/github-changelog-generator/pull/8) ([skywinder](https://github.com/skywinder))
-
 ## [1.0.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/1.0.0) (2014-11-07)
 
 [Full Changelog](https://github.com/github-changelog-generator/github-changelog-generator/compare/0.1.0...1.0.0)
@@ -1020,6 +1062,7 @@
 
 - Add support for fixed issues and implemented enchanments. [\#6](https://github.com/github-changelog-generator/github-changelog-generator/issues/6)
 - Implement option to specify output filename [\#4](https://github.com/github-changelog-generator/github-changelog-generator/issues/4)
+- Implement support of different tags. [\#8](https://github.com/github-changelog-generator/github-changelog-generator/pull/8) ([skywinder](https://github.com/skywinder))
 
 **Fixed bugs:**
 
@@ -1028,7 +1071,6 @@
 **Merged pull requests:**
 
 - Add support for issues in CHANGELOG [\#7](https://github.com/github-changelog-generator/github-changelog-generator/pull/7) ([skywinder](https://github.com/skywinder))
-- Fix parsing date of pull request [\#3](https://github.com/github-changelog-generator/github-changelog-generator/pull/3) ([skywinder](https://github.com/skywinder))
 
 ## [0.1.0](https://github.com/github-changelog-generator/github-changelog-generator/tree/0.1.0) (2014-11-07)
 
@@ -1036,6 +1078,7 @@
 
 **Merged pull requests:**
 
+- Fix parsing date of pull request [\#3](https://github.com/github-changelog-generator/github-changelog-generator/pull/3) ([skywinder](https://github.com/skywinder))
 - Add changelog generation for last tag [\#2](https://github.com/github-changelog-generator/github-changelog-generator/pull/2) ([skywinder](https://github.com/skywinder))
 - Add option \(-o --output\) to specify name of the output file. [\#1](https://github.com/github-changelog-generator/github-changelog-generator/pull/1) ([skywinder](https://github.com/skywinder))
 
@@ -1049,4 +1092,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4ce1d49..dfe6dc2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,6 +11,35 @@ Bug reports and pull requests from users are what keep this project working.
 5. Publish the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request
 
+## Running for development
+
+Make sure you have `ruby`, `gem` and `bundle` installed locally.
+
+If you don't: `gem install bundler`
+
+#### Step 1: Install requirements
+
+```
+bundle install
+```
+
+#### Step 2: Install linters: overcommit, rubocop
+
+```
+overcommit --install
+```
+
+#### Step 3: Run & debug
+
+TBD 
+
+#### Step 4: Test it
+
+```
+bundle exec rake
+gem build github_changelog_generator
+```
+
 ## Checking your work
 
 You can test your workflow with changelog generator with
diff --git a/Gemfile b/Gemfile
index 7331d38..589d2f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ group :test do
   gem "json"
   gem "multi_json"
   gem "rspec", "< 4"
+  gem "rspec_junit_formatter"
   gem "simplecov", "~>0.10", require: false
   gem "vcr"
   gem "webmock"
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..0d5583a
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,171 @@
+PATH
+  remote: .
+  specs:
+    github_changelog_generator (1.15.2)
+      activesupport
+      async (>= 1.25.0)
+      async-http-faraday
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.2.1)
+      rake (>= 10.0)
+      retriable (~> 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    async (1.26.2)
+      console (~> 1.0)
+      nio4r (~> 2.3)
+      timers (~> 4.1)
+    async-http (0.52.5)
+      async (~> 1.25)
+      async-io (~> 1.28)
+      async-pool (~> 0.2)
+      protocol-http (~> 0.20.0)
+      protocol-http1 (~> 0.13.0)
+      protocol-http2 (~> 0.14.0)
+    async-http-faraday (0.9.0)
+      async-http (~> 0.42)
+      faraday
+    async-io (1.30.1)
+      async (~> 1.14)
+    async-pool (0.3.2)
+      async (~> 1.25)
+    backports (3.18.2)
+    bump (0.9.0)
+    childprocess (4.0.0)
+    codeclimate-test-reporter (1.0.7)
+      simplecov
+    concurrent-ruby (1.1.7)
+    console (1.9.0)
+    crack (0.4.4)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    faraday (1.0.1)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.2.0)
+      faraday (>= 0.8)
+    hashdiff (1.0.1)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    iniparse (1.5.0)
+    json (2.3.1)
+    minitest (5.14.2)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    nio4r (2.5.4)
+    octokit (4.18.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    overcommit (0.57.0)
+      childprocess (>= 0.6.3, < 5)
+      iniparse (~> 1.4)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    protocol-hpack (1.4.2)
+    protocol-http (0.20.1)
+    protocol-http1 (0.13.1)
+      protocol-http (~> 0.19)
+    protocol-http2 (0.14.1)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.18)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.1)
+    retriable (3.1.2)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.92.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.5.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    ruby-progressbar (1.10.1)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    simplecov (0.19.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.3)
+    thread_safe (0.3.6)
+    timers (4.3.2)
+    tty-color (0.5.2)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    vcr (6.0.0)
+    webmock (3.9.1)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    yard (0.9.25)
+    yard-junk (0.0.7)
+      backports
+      rainbow
+      tty-color
+      yard
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bump
+  bundler
+  codeclimate-test-reporter (~> 1.0)
+  github_changelog_generator!
+  json
+  multi_json
+  overcommit (>= 0.31)
+  rake
+  rspec (< 4)
+  rspec_junit_formatter
+  rubocop (>= 0.50)
+  rubocop-performance
+  simplecov (~> 0.10)
+  vcr
+  webmock
+  yard-junk
+
+RUBY VERSION
+   ruby 2.7.1p83
+
+BUNDLED WITH
+   2.1.4
diff --git a/README.md b/README.md
index 68082f1..96ae825 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,6 @@
 
 # github-changelog-generator ![GitHub Logo](../master/images/logo.jpg)
 
-#### Update:
-
-🖖 Keep it alive: We need more Collaborators to github-changelog-generator [#727](https://github.com/github-changelog-generator/github-changelog-generator/issues/727)
-
----
 <!--
 To update TOC, please run:
 > doctoc ./README.md --github
@@ -78,7 +73,9 @@ or use `sudo gem install github_changelog_generator` (Linux).
 
 ### Running with CLI:
 
-	   github_changelog_generator -u github_username -p github_project
+	   github_changelog_generator -u github_project_namespace -p github_project
+
+(where the project namespace is _likely_ your username if it's a project you own, but it could also be the namespace of the project)
 
 
 ### Running with Docker
@@ -289,27 +286,6 @@ I'm not trying to compare the quality of handwritten and auto-generated logs. Th
 
 An auto-generated changelog really helps, even if you manually fill in the release notes!
 
-For example:
-
-When you find a closed bug, it is very useful to know which release fixed it.
-So that you can easily find the issue by \# in `CHANGELOG.md`.
-
-- It's not quite as easy to find this in handwritten releases notes.
-- A generated file saves you the trouble of remembering everything;
-  sometimes people forget to add things to a handwritten file.
-
-Ultimately, I think GitHub Releases are ideal for end-users.
-Meanwhile, `CHANGELOG.md` lives right in the repository, with its detailed list of changes, which is handy for developers.
-Finally, there's nothing wrong with using GitHub Releases alongside `CHANGELOG.md` in this combination.
-
-- ***I got an "API rate limit exceeded" error message. What does this mean?***
-
-GitHub [limits the number of API requests](https://developer.github.com/v3/#rate-limiting) you can make in an hour. You can make up to 5,000 requests per hour. For unauthenticated requests, the rate limit is only up to 60 requests per hour. Unauthenticated requests are associated with your IP address (not the user making requests).
-
-If you're seeing this warning, please do the following:
-
-1. Make sure you're providing an OAuth token, so you're not making requests anonymously. Using an OAuth token increases your hourly request maximum from 60 to 5000.
-2. If you have a large repo with lots of issues/PRs, you can use `--max-issues NUM` to limit the number of issues that are pulled back. For example: `--max-issues 1000`
 
 - ***My Ruby version is very old, can I use this?***
 
@@ -348,6 +324,9 @@ We have collected notes on how to contribute to this project in [CONTRIBUTING.md
 
 [CONTRIBUTING.md]: CONTRIBUTING.md
 
+## Contact us
+[Join the chat at gitter : github-changelog-generator](https://gitter.im/github-changelog-generator/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## License
 
 Github Changelog Generator is released under the [MIT License](http://www.opensource.org/licenses/MIT).
diff --git a/github_changelog_generator.gemspec b/github_changelog_generator.gemspec
index 638b2c5..f704d8b 100644
--- a/github_changelog_generator.gemspec
+++ b/github_changelog_generator.gemspec
@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.name               = "github_changelog_generator"
   spec.version            = GitHubChangelogGenerator::VERSION
 
-  spec.required_ruby_version = ">= 2.3.0"
-  spec.authors = ["Petr Korolev", "Olle Jonsson"]
+  spec.required_ruby_version = ">= 2.5.0"
+  spec.authors = ["Petr Korolev", "Olle Jonsson", "Marco Ferrari"]
   spec.email = "sky4winder+github_changelog_generator@gmail.com"
 
   spec.summary = "Script, that automatically generate changelog from your tags, issues, labels and pull requests."
@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("activesupport")
+  spec.add_runtime_dependency("async", ">= 1.25.0")
+  spec.add_runtime_dependency("async-http-faraday")
   spec.add_runtime_dependency("faraday-http-cache")
   spec.add_runtime_dependency("multi_json")
   spec.add_runtime_dependency("octokit", ["~> 4.6"])
diff --git a/lib/github_changelog_generator/generator/entry.rb b/lib/github_changelog_generator/generator/entry.rb
index ac85ea5..4c7a5aa 100644
--- a/lib/github_changelog_generator/generator/entry.rb
+++ b/lib/github_changelog_generator/generator/entry.rb
@@ -40,6 +40,15 @@ def generate_entry_for_tag(pull_requests, issues, newer_tag_name, newer_tag_link
       @content
     end
 
+    def line_labels_for(issue)
+      labels = if @options[:issue_line_labels] == ["ALL"]
+                 issue["labels"]
+               else
+                 issue["labels"].select { |label| @options[:issue_line_labels].include?(label["name"]) }
+               end
+      labels.map { |label| " \[[#{label['name']}](#{label['url'].sub('api.github.com/repos', 'github.com')})\]" }.join("")
+    end
+
     private
 
     # Creates section objects for this entry.
@@ -72,7 +81,7 @@ def parse_sections(sections_desc)
       end
 
       sections_json.collect do |name, v|
-        Section.new(name: name.to_s, prefix: v["prefix"], labels: v["labels"], options: @options)
+        Section.new(name: name.to_s, prefix: v["prefix"], labels: v["labels"], body_only: v["body_only"], options: @options)
       end
     end
 
@@ -205,14 +214,5 @@ def add_unmapped_section(issues)
       end
       nil
     end
-
-    def line_labels_for(issue)
-      labels = if @options[:issue_line_labels] == ["ALL"]
-                 issue["labels"]
-               else
-                 issue["labels"].select { |label| @options[:issue_line_labels].include?(label["name"]) }
-               end
-      labels.map { |label| " \[[#{label['name']}](#{label['url'].sub('api.github.com/repos', 'github.com')})\]" }.join("")
-    end
   end
 end
diff --git a/lib/github_changelog_generator/generator/generator.rb b/lib/github_changelog_generator/generator/generator.rb
index 0e2c52b..80723c7 100644
--- a/lib/github_changelog_generator/generator/generator.rb
+++ b/lib/github_changelog_generator/generator/generator.rb
@@ -27,6 +27,12 @@ class ChangelogGeneratorError < StandardError
   class Generator
     attr_accessor :options, :filtered_tags, :tag_section_mapping, :sorted_tags
 
+    CREDIT_LINE = <<~CREDIT
+      \\* *This Changelog was automatically generated \
+      by [github_changelog_generator]\
+      (https://github.com/github-changelog-generator/github-changelog-generator)*
+    CREDIT
+
     # A Generator responsible for all logic, related with changelog generation from ready-to-parse issues
     #
     # Example:
@@ -44,26 +50,21 @@ def initialize(options = {})
     # @return [String] Generated changelog file
     def compound_changelog
       @options.load_custom_ruby_files
-      fetch_and_filter_tags
-      fetch_issues_and_pr
-
-      log = ""
-      log += @options[:frontmatter] if @options[:frontmatter]
-      log += "#{options[:header]}\n\n"
-
-      log += if @options[:unreleased_only]
-               generate_entry_between_tags(@filtered_tags[0], nil)
-             else
-               generate_entries_for_all_tags
-             end
-
-      log += File.read(@options[:base]) if File.file?(@options[:base])
-
-      credit_line = "\n\n\\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*"
-      log.gsub!(/#{credit_line}(\n)?/, "") # Remove old credit lines
-      log += "#{credit_line}\n"
 
-      @log = log
+      Sync do
+        fetch_and_filter_tags
+        fetch_issues_and_pr
+
+        log = if @options[:unreleased_only]
+                generate_entry_between_tags(@filtered_tags[0], nil)
+              else
+                generate_entries_for_all_tags
+              end
+        log += File.read(@options[:base]) if File.file?(@options[:base])
+        log = remove_old_fixed_string(log)
+        log = insert_fixed_string(log)
+        @log = log
+      end
     end
 
     private
@@ -152,5 +153,26 @@ def fetch_issues_and_pr
       add_first_occurring_tag_to_prs(@sorted_tags, @pull_requests)
       nil
     end
+
+    # Remove the previously assigned fixed message.
+    # @param log [String] Old lines are fixed
+    def remove_old_fixed_string(log)
+      log.gsub!(/#{Regexp.escape(@options[:frontmatter])}/, "") if @options[:frontmatter]
+      log.gsub!(/#{Regexp.escape(@options[:header])}\n{,2}/, "")
+      log.gsub!(/\n{,2}#{Regexp.escape(CREDIT_LINE)}/, "") # Remove old credit lines
+      log
+    end
+
+    # Add template messages to given string. Previously added
+    # messages of the same wording are removed.
+    # @param log [String]
+    def insert_fixed_string(log)
+      ins = ""
+      ins += @options[:frontmatter] if @options[:frontmatter]
+      ins += "#{@options[:header]}\n\n"
+      log.insert(0, ins)
+      log += "\n\n#{CREDIT_LINE}"
+      log
+    end
   end
 end
diff --git a/lib/github_changelog_generator/generator/generator_fetcher.rb b/lib/github_changelog_generator/generator/generator_fetcher.rb
index ebac1e5..ddc2b54 100644
--- a/lib/github_changelog_generator/generator/generator_fetcher.rb
+++ b/lib/github_changelog_generator/generator/generator_fetcher.rb
@@ -2,8 +2,6 @@
 
 module GitHubChangelogGenerator
   class Generator
-    MAX_THREAD_NUMBER = 25
-
     # Fetch event for issues and pull requests
     # @return [Array] array of fetched issues
     def fetch_events_for_issues_and_pr
@@ -65,7 +63,7 @@ def add_first_occurring_tag_to_prs(tags, prs)
     # @param [Array] prs The PRs to associate.
     # @return [Array] PRs without their merge_commit_sha in a tag.
     def associate_tagged_prs(tags, prs, total)
-      @fetcher.fetch_tag_shas_async(tags)
+      @fetcher.fetch_tag_shas(tags)
 
       i = 0
       prs.reject do |pr|
@@ -212,8 +210,7 @@ def set_date_from_event(event, issue)
     # @return [Boolean] True if SHA is in the branch git history.
     def sha_in_release_branch(sha)
       branch = @options[:release_branch] || @fetcher.default_branch
-      commits_in_branch = @fetcher.fetch_compare(@fetcher.oldest_commit["sha"], branch)
-      shas_in_branch = commits_in_branch["commits"].collect { |commit| commit["sha"] }
+      shas_in_branch = @fetcher.commits_in_branch(branch)
       shas_in_branch.include?(sha)
     end
   end
diff --git a/lib/github_changelog_generator/generator/generator_processor.rb b/lib/github_changelog_generator/generator/generator_processor.rb
index 602525c..f452f01 100644
--- a/lib/github_changelog_generator/generator/generator_processor.rb
+++ b/lib/github_changelog_generator/generator/generator_processor.rb
@@ -69,6 +69,9 @@ def remove_issues_in_milestones(filtered_issues)
         # leave issues without milestones
         if issue["milestone"].nil?
           true
+        # remove issues of open milestones if option is set
+        elsif issue["milestone"]["state"] == "open"
+          @options[:issues_of_open_milestones]
         else
           # check, that this milestone in tag list:
           @filtered_tags.find { |tag| tag["name"] == issue["milestone"]["title"] }.nil?
@@ -130,21 +133,19 @@ def ensure_older_tag(older_tag, newer_tag)
     end
 
     def tag_older_new_tag?(newer_tag_time, time)
-      tag_in_range_new = if newer_tag_time.nil?
-                           true
-                         else
-                           time <= newer_tag_time
-                         end
-      tag_in_range_new
+      if newer_tag_time.nil?
+        true
+      else
+        time <= newer_tag_time
+      end
     end
 
     def tag_newer_old_tag?(older_tag_time, time)
-      tag_in_range_old = if older_tag_time.nil?
-                           true
-                         else
-                           time > older_tag_time
-                         end
-      tag_in_range_old
+      if older_tag_time.nil?
+        true
+      else
+        time > older_tag_time
+      end
     end
 
     # Include issues with labels, specified in :include_labels
@@ -152,19 +153,20 @@ def tag_newer_old_tag?(older_tag_time, time)
     # @return [Array] filtered array of issues
     def include_issues_by_labels(issues)
       filtered_issues = filter_by_include_labels(issues)
-      filtered_issues = filter_wo_labels(filtered_issues)
-      filtered_issues
+      filter_wo_labels(filtered_issues)
     end
 
     # @param [Array] issues Issues & PRs to filter when without labels
     # @return [Array] Issues & PRs without labels or empty array if
     #                 add_issues_wo_labels or add_pr_wo_labels are false
-    def filter_wo_labels(issues)
-      if (!issues.empty? && issues.first.key?("pull_requests") && options[:add_pr_wo_labels]) || options[:add_issues_wo_labels]
-        issues
-      else
-        issues.select { |issue| issue["labels"].map { |l| l["name"] }.any? }
+    def filter_wo_labels(items)
+      if items.any? && items.first.key?("pull_request")
+        return items if options[:add_pr_wo_labels]
+      elsif options[:add_issues_wo_labels]
+        return items
       end
+      # The default is to filter items without labels
+      items.select { |item| item["labels"].map { |l| l["name"] }.any? }
     end
 
     # @todo Document this
diff --git a/lib/github_changelog_generator/generator/generator_tags.rb b/lib/github_changelog_generator/generator/generator_tags.rb
index 3e0da72..8d202cf 100644
--- a/lib/github_changelog_generator/generator/generator_tags.rb
+++ b/lib/github_changelog_generator/generator/generator_tags.rb
@@ -11,15 +11,10 @@ def fetch_and_filter_tags
       fetch_tags_dates(all_tags) # Creates a Hash @tag_times_hash
       all_sorted_tags = sort_tags_by_date(all_tags)
 
-      @sorted_tags   = filter_excluded_tags(all_sorted_tags)
+      @sorted_tags   = filter_included_tags(all_sorted_tags)
+      @sorted_tags   = filter_excluded_tags(@sorted_tags)
       @filtered_tags = get_filtered_tags(@sorted_tags)
-
-      # Because we need to properly create compare links, we need a sorted list
-      # of all filtered tags (including the excluded ones). We'll exclude those
-      # tags from section headers inside the mapping function.
-      section_tags = get_filtered_tags(all_sorted_tags)
-
-      @tag_section_mapping = build_tag_section_mapping(section_tags, @filtered_tags)
+      @tag_section_mapping = build_tag_section_mapping(@filtered_tags, @filtered_tags)
 
       @filtered_tags
     end
@@ -83,7 +78,7 @@ def get_time_of_tag(tag_name)
     # @return [Array] link, name and time of the tag
     def detect_link_tag_time(newer_tag)
       # if tag is nil - set current time
-      newer_tag_time = newer_tag.nil? ? Time.new : get_time_of_tag(newer_tag)
+      newer_tag_time = newer_tag.nil? ? Time.new.getutc : get_time_of_tag(newer_tag)
 
       # if it's future release tag - set this value
       if newer_tag.nil? && options[:future_release]
@@ -161,6 +156,17 @@ def filter_due_tag(all_tags)
       filtered_tags
     end
 
+    # @param [Array] all_tags all tags
+    # @return [Array] filtered tags according to :include_tags_regex option
+    def filter_included_tags(all_tags)
+      if options[:include_tags_regex]
+        regex = Regexp.new(options[:include_tags_regex])
+        all_tags.select { |tag| regex =~ tag["name"] }
+      else
+        all_tags
+      end
+    end
+
     # @param [Array] all_tags all tags
     # @return [Array] filtered tags according :exclude_tags or :exclude_tags_regex option
     def filter_excluded_tags(all_tags)
diff --git a/lib/github_changelog_generator/generator/section.rb b/lib/github_changelog_generator/generator/section.rb
index 538b2b1..d211c5d 100644
--- a/lib/github_changelog_generator/generator/section.rb
+++ b/lib/github_changelog_generator/generator/section.rb
@@ -7,7 +7,23 @@ module GitHubChangelogGenerator
   #
   # @see GitHubChangelogGenerator::Entry
   class Section
-    attr_accessor :name, :prefix, :issues, :labels, :body_only
+    # @return [String]
+    attr_accessor :name
+
+    # @return [String] a merge prefix, or an issue prefix
+    attr_reader :prefix
+
+    # @return [Array<Hash>]
+    attr_reader :issues
+
+    # @return [Array<String>]
+    attr_reader :labels
+
+    # @return [Boolean]
+    attr_reader :body_only
+
+    # @return [Options]
+    attr_reader :options
 
     def initialize(opts = {})
       @name = opts[:name]
@@ -16,11 +32,12 @@ def initialize(opts = {})
       @issues = opts[:issues] || []
       @options = opts[:options] || Options.new({})
       @body_only = opts[:body_only] || false
+      @entry = Entry.new(options)
     end
 
     # Returns the content of a section.
     #
-    # @return [String] Generate section content
+    # @return [String] Generated section content
     def generate_content
       content = ""
 
@@ -49,7 +66,7 @@ def get_string_for_issue(issue)
       encapsulated_title = encapsulate_string issue["title"]
 
       title_with_number = "#{encapsulated_title} [\\##{issue['number']}](#{issue['html_url']})"
-      title_with_number = "#{title_with_number}#{line_labels_for(issue)}" if @options[:issue_line_labels].present?
+      title_with_number = "#{title_with_number}#{@entry.line_labels_for(issue)}" if @options[:issue_line_labels].present?
       line = issue_line_with_user(title_with_number, issue)
       issue_line_with_body(line, issue)
     end
@@ -60,16 +77,16 @@ def issue_line_with_body(line, issue)
 
       # get issue body till first line break
       body_paragraph = body_till_first_break(issue["body"])
-      # remove spaces from begining and end of the string
+      # remove spaces from beginning of the string
       body_paragraph.rstrip!
       # encapsulate to md
-      encapsulated_body = "\s\s\n" + encapsulate_string(body_paragraph)
+      encapsulated_body = "  \n#{encapsulate_string(body_paragraph)}"
 
       "**#{line}** #{encapsulated_body}"
     end
 
     def body_till_first_break(body)
-      body.split(/\n/).first
+      body.split(/\n/, 2).first
     end
 
     def issue_line_with_user(line, issue)
@@ -95,7 +112,10 @@ def encapsulate_string(string)
       string = string.gsub('\\', '\\\\')
 
       ENCAPSULATED_CHARACTERS.each do |char|
-        string = string.gsub(char, "\\#{char}")
+        # Only replace char with escaped version if it isn't inside backticks (markdown inline code).
+        # This relies on each opening '`' being closed (ie an even number in total).
+        # A char is *outside* backticks if there is an even number of backticks following it.
+        string = string.gsub(%r{#{Regexp.escape(char)}(?=([^`]*`[^`]*`)*[^`]*$)}, "\\#{char}")
       end
 
       string
diff --git a/lib/github_changelog_generator/gitlab_fetcher.rb b/lib/github_changelog_generator/gitlab_fetcher.rb
index 721c944..1b6793f 100644
--- a/lib/github_changelog_generator/gitlab_fetcher.rb
+++ b/lib/github_changelog_generator/gitlab_fetcher.rb
@@ -14,10 +14,10 @@ class GitlabFetcher
     PER_PAGE_NUMBER   = 100
     MAX_THREAD_NUMBER = 25
     MAX_FORBIDDEN_RETRIES = 100
-    CHANGELOG_AUTH_TOKEN = "CHANGELOG_AUTH_TOKEN"
+    CHANGELOG_GITHUB_TOKEN = "CHANGELOG_GITHUB_TOKEN"
     RATE_LIMIT_EXCEEDED_MSG = "Warning: Can't finish operation: GitLab API rate limit exceeded, changelog may be " \
     "missing some issues. You can limit the number of issues fetched using the `--max-issues NUM` argument."
-    NO_TOKEN_PROVIDED = "Warning: No token provided (-t option) and variable $CHANGELOG_AUTH_TOKEN was not found. " \
+    NO_TOKEN_PROVIDED = "Warning: No token provided (-t option) and variable $CHANGELOG_GITHUB_TOKEN was not found. " \
     "This script can make only 50 requests to GitLab API per hour without token!"
 
     # @param options [Hash] Options passed in
@@ -237,9 +237,8 @@ def fetch_compare(older, newer)
           commit["sha"] = commit["id"]
         end
         # TODO: do not know what the equivalent for gitlab is
-        if compare_data["compare_same_ref"] == true
-          raise StandardError, "Sha #{older} and sha #{newer} are not related; please file a github-changelog-generator issue and describe how to replicate this issue."
-        end
+        raise StandardError, "Sha #{older} and sha #{newer} are not related; please file a github-changelog-generator issue and describe how to replicate this issue." if compare_data["compare_same_ref"] == true
+
         @compares["#{older}...#{newer}"] = stringify_keys_deep(compare_data.to_hash)
       end
       @compares["#{older}...#{newer}"]
@@ -356,10 +355,8 @@ def extract_request_args(args)
     # This is wrapper with rescue block
     #
     # @return [Object] returns exactly the same, what you put in the block, but wrap it with begin-rescue block
-    def check_response
-      Retriable.retriable(retry_options) do
-        yield
-      end
+    def check_response(&block)
+      Retriable.retriable(retry_options, &block)
     rescue MovedPermanentlyError => e
       fail_with_message(e, "The repository has moved, update your configuration")
     rescue Gitlab::Error::Forbidden => e
@@ -407,7 +404,7 @@ def sys_abort(msg)
     #
     # @param [String] log_string
     def print_in_same_line(log_string)
-      print log_string + "\r"
+      print "#{log_string}\r"
     end
 
     # Print long line with spaces on same line to clear prev message
@@ -416,11 +413,11 @@ def print_empty_line
     end
 
     # Returns AUTH token. First try to use variable, provided by --token option,
-    # otherwise try to fetch it from CHANGELOG_AUTH_TOKEN env variable.
+    # otherwise try to fetch it from CHANGELOG_GITHUB_TOKEN env variable.
     #
     # @return [String]
     def fetch_auth_token
-      env_var = @options[:token].presence || ENV["CHANGELOG_AUTH_TOKEN"]
+      env_var = @options[:token].presence || ENV["CHANGELOG_GITHUB_TOKEN"]
 
       GitHubChangelogGenerator::Helper.log.warn NO_TOKEN_PROVIDED unless env_var
 
diff --git a/lib/github_changelog_generator/helper.rb b/lib/github_changelog_generator/helper.rb
index cdbd450..b7aec52 100644
--- a/lib/github_changelog_generator/helper.rb
+++ b/lib/github_changelog_generator/helper.rb
@@ -14,7 +14,7 @@ def self.test?
     @log ||= if test?
                Logger.new(nil) # don't show any logs when running tests
              else
-               Logger.new(STDOUT)
+               Logger.new($stdout)
              end
     @log.formatter = proc do |severity, _datetime, _progname, msg|
       string = "#{msg}\n"
diff --git a/lib/github_changelog_generator/octo_fetcher.rb b/lib/github_changelog_generator/octo_fetcher.rb
index 57f7091..6412451 100644
--- a/lib/github_changelog_generator/octo_fetcher.rb
+++ b/lib/github_changelog_generator/octo_fetcher.rb
@@ -2,6 +2,12 @@
 
 require "tmpdir"
 require "retriable"
+require "set"
+require "async"
+require "async/barrier"
+require "async/semaphore"
+require "async/http/faraday"
+
 module GitHubChangelogGenerator
   # A Fetcher responsible for all requests to GitHub and all basic manipulation with related data
   # (such as filtering, validating, e.t.c)
@@ -9,8 +15,8 @@ module GitHubChangelogGenerator
   # Example:
   # fetcher = GitHubChangelogGenerator::OctoFetcher.new(options)
   class OctoFetcher
-    PER_PAGE_NUMBER   = 100
-    MAX_THREAD_NUMBER = 10
+    PER_PAGE_NUMBER = 100
+    MAXIMUM_CONNECTIONS = 50
     MAX_FORBIDDEN_RETRIES = 100
     CHANGELOG_GITHUB_TOKEN = "CHANGELOG_GITHUB_TOKEN"
     GH_RATE_LIMIT_EXCEEDED_MSG = "Warning: Can't finish operation: GitHub API rate limit exceeded, changelog may be " \
@@ -31,47 +37,58 @@ def initialize(options = {})
       @project      = @options[:project]
       @since        = @options[:since]
       @http_cache   = @options[:http_cache]
-      @cache_file   = nil
-      @cache_log    = nil
       @commits      = []
-      @compares     = {}
-      prepare_cache
-      configure_octokit_ssl
-      @client = Octokit::Client.new(github_options)
+      @branches     = nil
+      @graph        = nil
+      @client = nil
+      @commits_in_tag_cache = {}
+    end
+
+    def middleware
+      Faraday::RackBuilder.new do |builder|
+        if @http_cache
+          cache_file = @options.fetch(:cache_file) { File.join(Dir.tmpdir, "github-changelog-http-cache") }
+          cache_log  = @options.fetch(:cache_log) { File.join(Dir.tmpdir, "github-changelog-logger.log") }
+
+          builder.use(
+            Faraday::HttpCache,
+            serializer: Marshal,
+            store: ActiveSupport::Cache::FileStore.new(cache_file),
+            logger: Logger.new(cache_log),
+            shared_cache: false
+          )
+        end
+
+        builder.use Octokit::Response::RaiseError
+        builder.adapter :async_http
+      end
     end
 
-    def prepare_cache
-      return unless @http_cache
+    def connection_options
+      ca_file = @options[:ssl_ca_file] || ENV["SSL_CA_FILE"] || File.expand_path("ssl_certs/cacert.pem", __dir__)
 
-      @cache_file = @options.fetch(:cache_file) { File.join(Dir.tmpdir, "github-changelog-http-cache") }
-      @cache_log  = @options.fetch(:cache_log) { File.join(Dir.tmpdir, "github-changelog-logger.log") }
-      init_cache
+      Octokit.connection_options.merge({ ssl: { ca_file: ca_file } })
     end
 
-    def github_options
-      result = {}
-      github_token = fetch_github_token
-      result[:access_token] = github_token if github_token
-      endpoint = @options[:github_endpoint]
-      result[:api_endpoint] = endpoint if endpoint
-      result
-    end
+    def client_options
+      options = {
+        middleware: middleware,
+        connection_options: connection_options
+      }
 
-    def configure_octokit_ssl
-      ca_file = @options[:ssl_ca_file] || ENV["SSL_CA_FILE"] || File.expand_path("ssl_certs/cacert.pem", __dir__)
-      Octokit.connection_options = { ssl: { ca_file: ca_file } }
-    end
+      if (github_token = fetch_github_token)
+        options[:access_token] = github_token
+      end
 
-    def init_cache
-      Octokit.middleware = Faraday::RackBuilder.new do |builder|
-        builder.use(Faraday::HttpCache, serializer: Marshal,
-                                        store: ActiveSupport::Cache::FileStore.new(@cache_file),
-                                        logger: Logger.new(@cache_log),
-                                        shared_cache: false)
-        builder.use Octokit::Response::RaiseError
-        builder.adapter Faraday.default_adapter
-        # builder.response :logger
+      if (endpoint = @options[:github_endpoint])
+        options[:api_endpoint] = endpoint
       end
+
+      options
+    end
+
+    def client
+      @client ||= Octokit::Client.new(client_options)
     end
 
     DEFAULT_REQUEST_OPTIONS = { per_page: PER_PAGE_NUMBER }
@@ -107,11 +124,11 @@ def calculate_pages(client, method, request_options)
     #
     # @return [Array <Hash>] array of tags in repo
     def github_fetch_tags
-      tags        = []
-      page_i      = 0
-      count_pages = calculate_pages(@client, "tags", {})
+      tags = []
+      page_i = 0
+      count_pages = calculate_pages(client, "tags", {})
 
-      iterate_pages(@client, "tags") do |new_tags|
+      iterate_pages(client, "tags") do |new_tags|
         page_i += PER_PAGE_NUMBER
         print_in_same_line("Fetching tags... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
         tags.concat(new_tags)
@@ -142,9 +159,9 @@ def fetch_closed_issues_and_pr
       print "Fetching closed issues...\r" if @options[:verbose]
       issues = []
       page_i = 0
-      count_pages = calculate_pages(@client, "issues", closed_pr_options)
+      count_pages = calculate_pages(client, "issues", closed_pr_options)
 
-      iterate_pages(@client, "issues", closed_pr_options) do |new_issues|
+      iterate_pages(client, "issues", closed_pr_options) do |new_issues|
         page_i += PER_PAGE_NUMBER
         print_in_same_line("Fetching issues... #{page_i}/#{count_pages * PER_PAGE_NUMBER}")
         issues.concat(new_issues)
@@ -165,10 +182,10 @@ def fetch_closed_pull_requests
       pull_requests = []
       options = { state: "closed" }
 
-      page_i      = 0
-      count_pages = calculate_pages(@client, "pull_requests", options)
+      page_i = 0
+      count_pages = calculate_pages(client, "pull_requests", options)
 
-      iterate_pages(@client, "pull_requests", options) do |new_pr|
+      iterate_pages(client, "pull_requests", options) do |new_pr|
         page_i += PER_PAGE_NUMBER
         log_string = "Fetching merged dates... #{page_i}/#{count_pages * PER_PAGE_NUMBER}"
         print_in_same_line(log_string)
@@ -185,14 +202,20 @@ def fetch_closed_pull_requests
     # @param [Array] issues
     # @return [Void]
     def fetch_events_async(issues)
-      i       = 0
-      threads = []
+      i = 0
+      # Add accept option explicitly for disabling the warning of preview API.
+      preview = { accept: Octokit::Preview::PREVIEW_TYPES[:project_card_events] }
+
+      barrier = Async::Barrier.new
+      semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
+
+      Sync do
+        client = self.client
 
-      issues.each_slice(MAX_THREAD_NUMBER) do |issues_slice|
-        issues_slice.each do |issue|
-          threads << Thread.new do
+        issues.each do |issue|
+          semaphore.async do
             issue["events"] = []
-            iterate_pages(@client, "issue_events", issue["number"]) do |new_event|
+            iterate_pages(client, "issue_events", issue["number"], preview) do |new_event|
               issue["events"].concat(new_event)
             end
             issue["events"] = issue["events"].map { |event| stringify_keys_deep(event.to_hash) }
@@ -200,12 +223,12 @@ def fetch_events_async(issues)
             i += 1
           end
         end
-        threads.each(&:join)
-        threads = []
-      end
 
-      # to clear line from prev print
-      print_empty_line
+        barrier.wait
+
+        # to clear line from prev print
+        print_empty_line
+      end
 
       Helper.log.info "Fetching events for issues and PR: #{i}"
     end
@@ -215,21 +238,25 @@ def fetch_events_async(issues)
     # @param [Array] prs The array of PRs.
     # @return [Void] No return; PRs are updated in-place.
     def fetch_comments_async(prs)
-      threads = []
+      barrier = Async::Barrier.new
+      semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
 
-      prs.each_slice(MAX_THREAD_NUMBER) do |prs_slice|
-        prs_slice.each do |pr|
-          threads << Thread.new do
+      Sync do
+        client = self.client
+
+        prs.each do |pr|
+          semaphore.async do
             pr["comments"] = []
-            iterate_pages(@client, "issue_comments", pr["number"]) do |new_comment|
+            iterate_pages(client, "issue_comments", pr["number"]) do |new_comment|
               pr["comments"].concat(new_comment)
             end
             pr["comments"] = pr["comments"].map { |comment| stringify_keys_deep(comment.to_hash) }
           end
         end
-        threads.each(&:join)
-        threads = []
+
+        barrier.wait
       end
+
       nil
     end
 
@@ -245,21 +272,6 @@ def fetch_date_of_tag(tag)
       commit_data["commit"]["committer"]["date"]
     end
 
-    # Fetch and cache comparison between two github refs
-    #
-    # @param [String] older The older sha/tag/branch.
-    # @param [String] newer The newer sha/tag/branch.
-    # @return [Hash] Github api response for comparison.
-    def fetch_compare(older, newer)
-      unless @compares["#{older}...#{newer}"]
-        compare_data = check_github_response { @client.compare(user_project, older, newer || "HEAD") }
-        raise StandardError, "Sha #{older} and sha #{newer} are not related; please file a github-changelog-generator issues and describe how to replicate this issue." if compare_data["status"] == "diverged"
-
-        @compares["#{older}...#{newer}"] = stringify_keys_deep(compare_data.to_hash)
-      end
-      @compares["#{older}...#{newer}"]
-    end
-
     # Fetch commit for specified event
     #
     # @param [String] commit_id the SHA of a commit to fetch
@@ -271,9 +283,11 @@ def fetch_commit(commit_id)
       if found
         stringify_keys_deep(found.to_hash)
       else
+        client = self.client
+
         # cache miss; don't add to @commits because unsure of order.
         check_github_response do
-          commit = @client.commit(user_project, commit_id)
+          commit = client.commit(user_project, commit_id)
           commit = stringify_keys_deep(commit.to_hash)
           commit
         end
@@ -285,8 +299,25 @@ def fetch_commit(commit_id)
     # @return [Array] Commits in a repo.
     def commits
       if @commits.empty?
-        iterate_pages(@client, "commits") do |new_commits|
-          @commits.concat(new_commits)
+        Sync do
+          barrier = Async::Barrier.new
+          semaphore = Async::Semaphore.new(MAXIMUM_CONNECTIONS, parent: barrier)
+
+          if (since_commit = @options[:since_commit])
+            iterate_pages(client, "commits_since", since_commit, parent: semaphore) do |new_commits|
+              @commits.concat(new_commits)
+            end
+          else
+            iterate_pages(client, "commits", parent: semaphore) do |new_commits|
+              @commits.concat(new_commits)
+            end
+          end
+
+          barrier.wait
+
+          @commits.sort! do |b, a|
+            a[:commit][:author][:date] <=> b[:commit][:author][:date]
+          end
         end
       end
       @commits
@@ -301,7 +332,15 @@ def oldest_commit
 
     # @return [String] Default branch of the repo
     def default_branch
-      @default_branch ||= @client.repository(user_project)[:default_branch]
+      @default_branch ||= client.repository(user_project)[:default_branch]
+    end
+
+    def commits_in_branch(name)
+      @branches ||= client.branches(user_project).map { |branch| [branch[:name], branch] }.to_h
+
+      if (branch = @branches[name])
+        commits_in_tag(branch[:commit][:sha])
+      end
     end
 
     # Fetch all SHAs occurring in or before a given tag and add them to
@@ -309,34 +348,40 @@ def default_branch
     #
     # @param [Array] tags The array of tags.
     # @return [Nil] No return; tags are updated in-place.
-    def fetch_tag_shas_async(tags)
-      i = 0
-      threads = []
-      print_in_same_line("Fetching SHAs for tags: #{i}/#{tags.count}\r") if @options[:verbose]
-
-      tags.each_slice(MAX_THREAD_NUMBER) do |tags_slice|
-        tags_slice.each do |tag|
-          threads << Thread.new do
-            # Use oldest commit because comparing two arbitrary tags may be diverged
-            commits_in_tag = fetch_compare(oldest_commit["sha"], tag["name"])
-            tag["shas_in_tag"] = commits_in_tag["commits"].collect { |commit| commit["sha"] }
-            print_in_same_line("Fetching SHAs for tags: #{i + 1}/#{tags.count}") if @options[:verbose]
-            i += 1
+    def fetch_tag_shas(tags)
+      # Reverse the tags array to gain max benefit from the @commits_in_tag_cache
+      tags.reverse_each do |tag|
+        tag["shas_in_tag"] = commits_in_tag(tag["commit"]["sha"])
+      end
+    end
+
+    private
+
+    def commits_in_tag(sha, shas = Set.new)
+      # Reduce multiple runs for the same tag
+      return @commits_in_tag_cache[sha] if @commits_in_tag_cache.key?(sha)
+
+      @graph ||= commits.map { |commit| [commit[:sha], commit] }.to_h
+      return shas unless (current = @graph[sha])
+
+      queue = [current]
+      while queue.any?
+        commit = queue.shift
+        # If we've already processed this sha, just grab it's parents from the cache
+        if @commits_in_tag_cache.key?(commit[:sha])
+          shas.merge(@commits_in_tag_cache[commit[:sha]])
+        else
+          shas.add(commit[:sha])
+          commit[:parents].each do |p|
+            queue.push(@graph[p[:sha]]) unless shas.include?(p[:sha])
           end
         end
-        threads.each(&:join)
-        threads = []
       end
 
-      # to clear line from prev print
-      print_empty_line
-
-      Helper.log.info "Fetching SHAs for tags: #{i}"
-      nil
+      @commits_in_tag_cache[sha] = shas
+      shas
     end
 
-    private
-
     def stringify_keys_deep(indata)
       case indata
       when Array
@@ -364,39 +409,41 @@ def stringify_keys_deep(indata)
     # @yield [Sawyer::Resource] An OctoKit-provided response (which can be empty)
     #
     # @return [void]
-    def iterate_pages(client, method, *args)
-      args << DEFAULT_REQUEST_OPTIONS.merge(extract_request_args(args))
+    def iterate_pages(client, method, *arguments, parent: nil, **options)
+      options = DEFAULT_REQUEST_OPTIONS.merge(options)
 
-      check_github_response { client.send(method, user_project, *args) }
+      check_github_response { client.send(method, user_project, *arguments, **options) }
       last_response = client.last_response.tap do |response|
         raise(MovedPermanentlyError, response.data[:url]) if response.status == 301
       end
 
       yield(last_response.data)
 
-      until (next_one = last_response.rels[:next]).nil?
-        last_response = check_github_response { next_one.get }
-        yield(last_response.data)
-      end
-    end
-
-    def extract_request_args(args)
-      if args.size == 1 && args.first.is_a?(Hash)
-        args.delete_at(0)
-      elsif args.size > 1 && args.last.is_a?(Hash)
-        args.delete_at(args.length - 1)
-      else
-        {}
+      if parent.nil?
+        # The snail visits one leaf at a time:
+        until (next_one = last_response.rels[:next]).nil?
+          last_response = check_github_response { next_one.get }
+          yield(last_response.data)
+        end
+      elsif (last = last_response.rels[:last])
+        # OR we bring out the gatling gun:
+        parameters = querystring_as_hash(last.href)
+        last_page = Integer(parameters["page"])
+
+        (2..last_page).each do |page|
+          parent.async do
+            data = check_github_response { client.send(method, user_project, *arguments, page: page, **options) }
+            yield data
+          end
+        end
       end
     end
 
     # This is wrapper with rescue block
     #
     # @return [Object] returns exactly the same, what you put in the block, but wrap it with begin-rescue block
-    def check_github_response
-      Retriable.retriable(retry_options) do
-        yield
-      end
+    def check_github_response(&block)
+      Retriable.retriable(retry_options, &block)
     rescue MovedPermanentlyError => e
       fail_with_message(e, "The repository has moved, update your configuration")
     rescue Octokit::Forbidden => e
@@ -432,7 +479,7 @@ def retry_callback
         Helper.log.warn("RETRY - #{exception.class}: '#{exception.message}'")
         Helper.log.warn("#{try} tries in #{elapsed_time} seconds and #{next_interval} seconds until the next try")
         Helper.log.warn GH_RATE_LIMIT_EXCEEDED_MSG
-        Helper.log.warn @client.rate_limit
+        Helper.log.warn(client.rate_limit)
       end
     end
 
@@ -444,7 +491,7 @@ def sys_abort(msg)
     #
     # @param [String] log_string
     def print_in_same_line(log_string)
-      print log_string + "\r"
+      print "#{log_string}\r"
     end
 
     # Print long line with spaces on same line to clear prev message
diff --git a/lib/github_changelog_generator/options.rb b/lib/github_changelog_generator/options.rb
index e099ab8..1090862 100644
--- a/lib/github_changelog_generator/options.rb
+++ b/lib/github_changelog_generator/options.rb
@@ -37,6 +37,7 @@ class Options < SimpleDelegator
       exclude_tags
       exclude_tags_regex
       filter_issues_by_milestone
+      issues_of_open_milestones
       frontmatter
       future_release
       github_endpoint
@@ -45,6 +46,7 @@ class Options < SimpleDelegator
       header
       http_cache
       include_labels
+      include_tags_regex
       issue_prefix
       issue_line_labels
       issue_line_body
@@ -63,6 +65,7 @@ class Options < SimpleDelegator
       security_prefix
       simple_list
       since_tag
+      since_commit
       ssl_ca_file
       summary_labels
       summary_prefix
diff --git a/lib/github_changelog_generator/parser.rb b/lib/github_changelog_generator/parser.rb
index bc219c4..9f0576a 100755
--- a/lib/github_changelog_generator/parser.rb
+++ b/lib/github_changelog_generator/parser.rb
@@ -37,7 +37,7 @@ def self.parse_options
     def self.setup_parser(options)
       OptionParser.new do |opts| # rubocop:disable Metrics/BlockLength
         opts.banner = "Usage: github_changelog_generator --user USER --project PROJECT [options]"
-        opts.on("-u", "--user USER", "Username of the owner of target GitHub repo.") do |last|
+        opts.on("-u", "--user USER", "Username of the owner of the target GitHub repo OR the namespace of target Github repo if owned by an organization.") do |last|
           options[:user] = last
         end
         opts.on("-p", "--project PROJECT", "Name of project on GitHub.") do |last|
@@ -89,7 +89,7 @@ def self.setup_parser(options)
           options[:add_sections] = v
         end
         opts.on("--front-matter [JSON]", "Add YAML front matter. Formatted as JSON because it's easier to add on the command line.") do |v|
-          options[:frontmatter] = JSON.parse(v).to_yaml + "---\n"
+          options[:frontmatter] = "#{JSON.parse(v).to_yaml}---\n"
         end
         opts.on("--pr-label [LABEL]", "Set up custom label for pull requests section. Default is \"**Merged pull requests:**\".") do |v|
           options[:merge_prefix] = v
@@ -109,6 +109,9 @@ def self.setup_parser(options)
         opts.on("--[no-]filter-by-milestone", "Use milestone to detect when issue was resolved. Default is true.") do |last|
           options[:filter_issues_by_milestone] = last
         end
+        opts.on("--[no-]issues-of-open-milestones", "Include issues of open milestones. Default is true.") do |v|
+          options[:issues_of_open_milestones] = v
+        end
         opts.on("--[no-]author", "Add author of pull request at the end. Default is true.") do |author|
           options[:author] = author
         end
@@ -157,6 +160,9 @@ def self.setup_parser(options)
         opts.on("--issue-line-labels x,y,z", Array, 'The specified labels will be shown in brackets next to each matching issue. Use "ALL" to show all labels. Default is [].') do |list|
           options[:issue_line_labels] = list
         end
+        opts.on("--include-tags-regex [REGEX]", "Apply a regular expression on tag names so that they can be included, for example: --include-tags-regex \".*\+\d{1,}\".") do |last|
+          options[:include_tags_regex] = last
+        end
         opts.on("--exclude-tags  x,y,z", Array, "Changelog will exclude specified tags") do |list|
           options[:exclude_tags] = list
         end
@@ -169,6 +175,9 @@ def self.setup_parser(options)
         opts.on("--due-tag  x", "Changelog will end before specified tag.") do |v|
           options[:due_tag] = v
         end
+        opts.on("--since-commit  x", "Fetch only commits after this time. eg. \"2017-01-01 10:00:00\"") do |v|
+          options[:since_commit] = v
+        end
         opts.on("--max-issues [NUMBER]", Integer, "Maximum number of issues to fetch from GitHub. Default is unlimited.") do |max|
           options[:max_issues] = max
         end
@@ -233,6 +242,7 @@ def self.default_options
         add_pr_wo_labels: true,
         pulls: true,
         filter_issues_by_milestone: true,
+        issues_of_open_milestones: true,
         author: true,
         unreleased: true,
         unreleased_label: "Unreleased",
diff --git a/lib/github_changelog_generator/parser_file.rb b/lib/github_changelog_generator/parser_file.rb
index 61acf01..e5b5e10 100644
--- a/lib/github_changelog_generator/parser_file.rb
+++ b/lib/github_changelog_generator/parser_file.rb
@@ -56,7 +56,7 @@ def parse_line!(line, line_number)
 
     # Returns true if the line starts with a pound sign or a semi-colon.
     def non_configuration_line?(line)
-      line =~ /^[\#;]/ || line =~ /^[\s]+$/
+      line =~ /^[\#;]/ || line =~ /^\s+$/
     end
 
     # Returns a the option name as a symbol and its string value sans newlines.
diff --git a/lib/github_changelog_generator/reader.rb b/lib/github_changelog_generator/reader.rb
index 1342b2a..6a3a75a 100644
--- a/lib/github_changelog_generator/reader.rb
+++ b/lib/github_changelog_generator/reader.rb
@@ -29,8 +29,8 @@ def initialize(options = {})
       defaults = {
         heading_level: "##",
         heading_structures: [
-          /^## \[(?<version>.+?)\]\((?<url>.+?)\)( \((?<date>.+?)\))?$/,
-          /^## (?<version>.+?)( \((?<date>.+?)\))?$/
+          /^## \[(?<version>.+?)\]\((?<url>.+?)\)( \((?<date>.+?)\))?$/, # rubocop:disable Lint/MixedRegexpCaptureTypes
+          /^## (?<version>.+?)( \((?<date>.+?)\))?$/ # rubocop:disable Lint/MixedRegexpCaptureTypes
         ]
       }
 
diff --git a/lib/github_changelog_generator/task.rb b/lib/github_changelog_generator/task.rb
index d06dc64..cec8796 100644
--- a/lib/github_changelog_generator/task.rb
+++ b/lib/github_changelog_generator/task.rb
@@ -15,11 +15,11 @@ class RakeTask < ::Rake::TaskLib
                   pulls filter_issues_by_milestone author
                   unreleased_only unreleased unreleased_label
                   compare_link include_labels exclude_labels
-                  bug_labels enhancement_labels
+                  bug_labels enhancement_labels include_tags_regex
                   between_tags exclude_tags exclude_tags_regex since_tag max_issues
                   github_site github_endpoint simple_list gitlab
                   future_release release_branch verbose release_url
-                  base configure_sections add_sections]
+                  base configure_sections add_sections http_cache]
 
     OPTIONS.each do |o|
       attr_accessor o.to_sym
@@ -31,6 +31,7 @@ class RakeTask < ::Rake::TaskLib
     #
     #   GitHubChangelogGenerator::RakeTask.new
     def initialize(*args, &task_block)
+      super
       @name = args.shift || :changelog
 
       define(args, &task_block)
diff --git a/lib/github_changelog_generator/version.rb b/lib/github_changelog_generator/version.rb
index 507620a..045f8cc 100644
--- a/lib/github_changelog_generator/version.rb
+++ b/lib/github_changelog_generator/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubChangelogGenerator
-  VERSION = "1.15.0"
+  VERSION = "1.15.2"
 end
diff --git a/man/git-generate-changelog.1 b/man/git-generate-changelog.1
index 99508ee..6e8bc9c 100644
--- a/man/git-generate-changelog.1
+++ b/man/git-generate-changelog.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-GENERATE\-CHANGELOG" "1" "May 2018" "" ""
+.TH "GIT\-GENERATE\-CHANGELOG" "1" "May 2020" "" ""
 .
 .SH "NAME"
 \fBgit\-generate\-changelog\fR \- Generate changelog from GitHub
@@ -157,6 +157,12 @@ Include pull\-requests in changelog\. Default is true\.
 Use milestone to detect when issue was resolved\. Default is true\.
 .
 .P
+\-\-[no\-]issues\-of\-open\-milestones
+.
+.P
+Include issues of open milestones\. Default is true\.
+.
+.P
 \-\-[no\-]author
 .
 .P
@@ -277,6 +283,12 @@ Changelog will start after specified tag\.
 Changelog will end before specified tag\.
 .
 .P
+\-\-since\-commit x
+.
+.P
+Fetch only commits after this time\. eg\. "2017\-01\-01 10:00:00"
+.
+.P
 \-\-max\-issues [NUMBER]
 .
 .P
@@ -375,7 +387,7 @@ GitHub pull requests that have been merged whose merge commit SHA has been modif
 Written by Petr Korolev sky4winder@gmail\.com
 .
 .SH "REPORTING BUGS"
-<\fIhttps://github\.com/github-changelog-generator/github\-changelog\-generator/issues\fR>
+<\fIhttps://github\.com/github\-changelog\-generator/github\-changelog\-generator/issues\fR>
 .
 .SH "SEE ALSO"
-<\fIhttps://github\.com/github-changelog-generator/github\-changelog\-generator/\fR>
+<\fIhttps://github\.com/github\-changelog\-generator/github\-changelog\-generator/\fR>
diff --git a/man/git-generate-changelog.1.html b/man/git-generate-changelog.1.html
index 91ce5d8..0f64784 100644
--- a/man/git-generate-changelog.1.html
+++ b/man/git-generate-changelog.1.html
@@ -181,6 +181,10 @@ <h2 id="OPTIONS">OPTIONS</h2>
 
 <p>  Use milestone to detect when issue was resolved. Default is true.</p>
 
+<p>  --[no-]issues-of-open-milestones</p>
+
+<p>  Include issues of open milestones. Default is true.</p>
+
 <p>  --[no-]author</p>
 
 <p>  Add author of pull request at the end. Default is true.</p>
@@ -261,6 +265,10 @@ <h2 id="OPTIONS">OPTIONS</h2>
 
 <p>  Changelog will end before specified tag.</p>
 
+<p>  --since-commit x</p>
+
+<p>  Fetch only commits after this time. eg. "2017-01-01 10:00:00"</p>
+
 <p>  --max-issues [NUMBER]</p>
 
 <p>  Maximum number of issues to fetch from GitHub. Default is unlimited.</p>
@@ -342,7 +350,7 @@ <h2 id="SEE-ALSO">SEE ALSO</h2>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>May 2018</li>
+    <li class='tc'>May 2020</li>
     <li class='tr'>git-generate-changelog(1)</li>
   </ol>
 
diff --git a/man/git-generate-changelog.md b/man/git-generate-changelog.md
index 8f8ac7f..b59c7a0 100644
--- a/man/git-generate-changelog.md
+++ b/man/git-generate-changelog.md
@@ -107,6 +107,10 @@ Automatically generate changelog from your tags, issues, labels and pull request
 
   Use milestone to detect when issue was resolved. Default is true.
 
+  --[no-]issues-of-open-milestones
+
+  Include issues of open milestones. Default is true.
+
   --[no-]author
 
   Add author of pull request at the end. Default is true.
@@ -187,6 +191,10 @@ Automatically generate changelog from your tags, issues, labels and pull request
 
   Changelog will end before specified tag.
 
+  --since-commit x
+  
+  Fetch only commits after this time. eg. "2017-01-01 10:00:00"
+
   --max-issues [NUMBER]
 
   Maximum number of issues to fetch from GitHub. Default is unlimited.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8e4c833..f100f33 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -44,7 +44,7 @@ module SpecHelper
     decode_compressed_response: true
   }
   c.filter_sensitive_data("<GITHUB_TOKEN>") do
-    "token #{ENV.fetch('CHANGELOG_GITHUB_TOKEN') { 'frobnitz' }}"
+    "token #{ENV.fetch('CHANGELOG_GITHUB_TOKEN', 'frobnitz')}"
   end
 
   c.configure_rspec_metadata!
diff --git a/spec/unit/generator/entry_spec.rb b/spec/unit/generator/entry_spec.rb
index 8626189..d4e9f73 100644
--- a/spec/unit/generator/entry_spec.rb
+++ b/spec/unit/generator/entry_spec.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/ModuleLength
 module GitHubChangelogGenerator
   RSpec.describe Entry do
     def label(name)
@@ -58,9 +57,6 @@ def default_sections
     let(:issues) { [] }
     let(:pull_requests) { [] }
     let(:tags) { [] }
-    let(:compare_shas) do
-      { "aaaaa1...master" => ["aaaaa1"] }
-    end
 
     # Default to standard options minus verbose to avoid output during testing.
     let(:options) do
@@ -76,15 +72,14 @@ def default_sections
         fetch_closed_issues_and_pr: [issues, pull_requests],
         fetch_closed_pull_requests: [],
         fetch_events_async: issues + pull_requests,
-        fetch_tag_shas_async: nil,
+        fetch_tag_shas: nil,
         fetch_comments_async: nil,
         default_branch: "master",
         oldest_commit: { "sha" => "aaaaa1" },
         fetch_commit: { "commit" => { "author" => { "date" => Time.now.utc } } }
       )
-      allow(fake_fetcher).to receive(:fetch_compare) do |old, new|
-        # Comparisons has a "commits" key of an array of commit hashes each with a "sha" key.
-        { "commits" => compare_shas["#{old}...#{new}"].collect { |sha| { "sha" => sha } } }
+      allow(fake_fetcher).to receive(:commits_in_branch) do
+        ["aaaaa1"]
       end
       allow(GitHubChangelogGenerator::OctoFetcher).to receive(:new).and_return(fake_fetcher)
       generator = GitHubChangelogGenerator::Generator.new(options)
@@ -426,6 +421,18 @@ def default_sections
             sections_json.shift
           end
         end
+        context "parse also body_only" do
+          let(:sections_string) { "{ \"foo\": { \"prefix\": \"foofix\", \"labels\": [\"test1\", \"test2\"]}, \"bar\": { \"prefix\": \"barfix\", \"labels\": [\"test3\", \"test4\"], \"body_only\": true}}" }
+
+          it "returns correctly constructed sections" do
+            require "json"
+
+            parsed_sections = subject.send(:parse_sections, sections_string)
+
+            expect(parsed_sections[0].body_only).to eq false
+            expect(parsed_sections[1].body_only).to eq true
+          end
+        end
       end
       context "hash" do
         let(:sections_hash) do
@@ -548,14 +555,14 @@ def default_sections
         end
 
         it "assigns issues to the correct sections" do
-          breaking_section = entry_sections.select { |section| section.name == "breaking" }[0]
-          enhancement_section = entry_sections.select { |section| section.name == "enhancements" }[0]
-          bug_section = entry_sections.select { |section| section.name == "bugs" }[0]
-          deprecated_section = entry_sections.select { |section| section.name == "deprecated" }[0]
-          removed_section = entry_sections.select { |section| section.name == "removed" }[0]
-          security_section = entry_sections.select { |section| section.name == "security" }[0]
-          issue_section = entry_sections.select { |section| section.name == "issues" }[0]
-          merged_section = entry_sections.select { |section| section.name == "merged" }[0]
+          breaking_section = entry_sections.find { |section| section.name == "breaking" }
+          enhancement_section = entry_sections.find { |section| section.name == "enhancements" }
+          bug_section = entry_sections.find { |section| section.name == "bugs" }
+          deprecated_section = entry_sections.find { |section| section.name == "deprecated" }
+          removed_section = entry_sections.find { |section| section.name == "removed" }
+          security_section = entry_sections.find { |section| section.name == "security" }
+          issue_section = entry_sections.find { |section| section.name == "issues" }
+          merged_section = entry_sections.find { |section| section.name == "merged" }
 
           expect(titles_for(breaking_section.issues)).to eq(["issue breaking", "issue all the labels", "pr breaking", "pr all the labels"])
           expect(titles_for(enhancement_section.issues)).to eq(["issue enhancement", "pr enhancement"])
@@ -612,10 +619,10 @@ def default_sections
         end
 
         it "assigns issues to the correct sections" do
-          foo_section = entry_sections.select { |section| section.name == "foo" }[0]
-          bar_section = entry_sections.select { |section| section.name == "bar" }[0]
-          issue_section = entry_sections.select { |section| section.name == "issues" }[0]
-          merged_section = entry_sections.select { |section| section.name == "merged" }[0]
+          foo_section = entry_sections.find { |section| section.name == "foo" }
+          bar_section = entry_sections.find { |section| section.name == "bar" }
+          issue_section = entry_sections.find { |section| section.name == "issues" }
+          merged_section = entry_sections.find { |section| section.name == "merged" }
 
           aggregate_failures "checks all sections" do
             expect(titles_for(foo_section.issues)).to eq(["issue test1", "issue all the labels", "issue some included labels", "pr test1", "pr all the labels", "pr some included labels"])
@@ -670,10 +677,10 @@ def default_sections
         end
 
         it "assigns issues to the correct sections" do
-          foo_section = entry_sections.select { |section| section.name == "foo" }[0]
-          bar_section = entry_sections.select { |section| section.name == "bar" }[0]
-          issue_section = entry_sections.select { |section| section.name == "issues" }[0]
-          merged_section = entry_sections.select { |section| section.name == "merged" }[0]
+          foo_section = entry_sections.find { |section| section.name == "foo" }
+          bar_section = entry_sections.find { |section| section.name == "bar" }
+          issue_section = entry_sections.find { |section| section.name == "issues" }
+          merged_section = entry_sections.find { |section| section.name == "merged" }
 
           aggregate_failures "checks all sections" do
             expect(titles_for(foo_section.issues)).to eq(["issue test1", "issue all the labels", "pr test1", "pr all the labels"])
@@ -737,12 +744,12 @@ def default_sections
         end
 
         it "assigns issues to the correct sections" do
-          foo_section = entry_sections.select { |section| section.name == "foo" }[0]
-          breaking_section = entry_sections.select { |section| section.name == "breaking" }[0]
-          enhancement_section = entry_sections.select { |section| section.name == "enhancements" }[0]
-          bug_section = entry_sections.select { |section| section.name == "bugs" }[0]
-          issue_section = entry_sections.select { |section| section.name == "issues" }[0]
-          merged_section = entry_sections.select { |section| section.name == "merged" }[0]
+          foo_section = entry_sections.find { |section| section.name == "foo" }
+          breaking_section = entry_sections.find { |section| section.name == "breaking" }
+          enhancement_section = entry_sections.find { |section| section.name == "enhancements" }
+          bug_section = entry_sections.find { |section| section.name == "bugs" }
+          issue_section = entry_sections.find { |section| section.name == "issues" }
+          merged_section = entry_sections.find { |section| section.name == "merged" }
 
           aggregate_failures "checks all sections" do
             expect(titles_for(breaking_section.issues)).to eq(["issue all the labels", "pr all the labels"])
@@ -757,4 +764,3 @@ def default_sections
     end
   end
 end
-# rubocop:enable Metrics/ModuleLength
diff --git a/spec/unit/generator/generator_processor_spec.rb b/spec/unit/generator/generator_processor_spec.rb
index c12d5cf..f187214 100644
--- a/spec/unit/generator/generator_processor_spec.rb
+++ b/spec/unit/generator/generator_processor_spec.rb
@@ -5,82 +5,137 @@ module GitHubChangelogGenerator
     let(:default_options) { GitHubChangelogGenerator::Parser.default_options.merge(verbose: false) }
     let(:options) { {} }
     let(:generator) { described_class.new(default_options.merge(options)) }
-
     let(:bad_label) { { "name" => "BAD" } }
-    let(:bad_issue) { { "labels" => [bad_label] } }
     let(:good_label) { { "name" => "GOOD" } }
-    let(:good_issue) { { "labels" => [good_label] } }
-    let(:unlabeled_issue) { { "labels" => [] } }
-    let(:issues) { [bad_issue, good_issue, unlabeled_issue] }
 
-    describe "#exclude_issues_by_labels" do
-      subject do
-        generator.exclude_issues_by_labels(issues)
-      end
+    describe "pull requests" do
+      let(:bad_pull_request) { { "pull_request" => {}, "labels" => [bad_label] } }
+      let(:good_pull_request) { { "pull_request" => {}, "labels" => [good_label] } }
+      let(:unlabeled_pull_request) { { "pull_request" => {}, "labels" => [] } }
+      let(:pull_requests) { [bad_pull_request, good_pull_request, unlabeled_pull_request] }
 
-      let(:expected_issues) { issues }
+      describe "#filter_wo_labels" do
+        subject do
+          generator.filter_wo_labels(pull_requests)
+        end
 
-      it { is_expected.to eq(expected_issues) }
+        let(:expected_pull_requests) { pull_requests }
 
-      context "when 'exclude_lables' is provided" do
-        let(:options) { { exclude_labels: %w[BAD BOO] } }
-        let(:expected_issues) { [good_issue, unlabeled_issue] }
+        it { is_expected.to eq(expected_pull_requests) }
 
-        it { is_expected.to eq(expected_issues) }
-      end
+        context "when 'add_pr_wo_labels' is false" do
+          let(:options) { { add_pr_wo_labels: false } }
+          let(:expected_pull_requests) { [bad_pull_request, good_pull_request] }
 
-      context "with no option given" do
-        subject(:generator) { described_class.new }
-        it "passes everything through when no option given" do
-          result = generator.exclude_issues_by_labels(issues)
+          it { is_expected.to eq(expected_pull_requests) }
+        end
+
+        context "when 'add_pr_wo_labels' is true" do
+          let(:options) { { add_pr_wo_labels: true } }
 
-          expect(result).to eq(issues)
+          it { is_expected.to eq(expected_pull_requests) }
         end
       end
     end
 
-    describe "#get_filtered_issues" do
-      subject do
-        generator.get_filtered_issues(issues)
-      end
+    describe "issues" do
+      let(:bad_issue) { { "labels" => [bad_label] } }
+      let(:good_issue) { { "labels" => [good_label] } }
+      let(:unlabeled_issue) { { "labels" => [] } }
+      let(:issues) { [bad_issue, good_issue, unlabeled_issue] }
 
-      let(:expected_issues) { issues }
-
-      it { is_expected.to eq(expected_issues) }
+      describe "#filter_wo_labels" do
+        subject do
+          generator.filter_wo_labels(issues)
+        end
 
-      context "when 'exclude_labels' is provided" do
-        let(:options) { { exclude_labels: %w[BAD BOO] } }
-        let(:expected_issues) { [good_issue, unlabeled_issue] }
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
+
+        context "when 'add_issues_wo_labels' is false" do
+          let(:options) { { add_issues_wo_labels: false } }
+          let(:expected_issues) { [bad_issue, good_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
+
+        context "when 'add_issues_wo_labels' is true" do
+          let(:options) { { add_issues_wo_labels: true } }
+
+          it { is_expected.to eq(expected_issues) }
+        end
       end
 
-      context "when 'add_issues_wo_labels' is false" do
-        let(:options) { { add_issues_wo_labels: false } }
-        let(:expected_issues) { [bad_issue, good_issue] }
+      describe "#exclude_issues_by_labels" do
+        subject do
+          generator.exclude_issues_by_labels(issues)
+        end
+
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
 
-        context "with 'exclude_labels'" do
-          let(:options) { { add_issues_wo_labels: false, exclude_labels: %w[GOOD] } }
-          let(:expected_issues) { [bad_issue] }
+        context "when 'exclude_labels' is provided" do
+          let(:options) { { exclude_labels: %w[BAD BOO] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
 
           it { is_expected.to eq(expected_issues) }
         end
 
-        context "with 'include_labels'" do
-          let(:options) { { add_issues_wo_labels: false, include_labels: %w[GOOD] } }
-          let(:expected_issues) { [good_issue] }
+        context "with no option given" do
+          subject(:generator) { described_class.new }
+          it "passes everything through when no option given" do
+            result = generator.exclude_issues_by_labels(issues)
 
-          it { is_expected.to eq(expected_issues) }
+            expect(result).to eq(issues)
+          end
         end
       end
 
-      context "when 'include_labels' is specified" do
-        let(:options) { { include_labels: %w[GOOD] } }
-        let(:expected_issues) { [good_issue, unlabeled_issue] }
+      describe "#get_filtered_issues" do
+        subject do
+          generator.get_filtered_issues(issues)
+        end
+
+        let(:expected_issues) { issues }
 
         it { is_expected.to eq(expected_issues) }
+
+        context "when 'exclude_labels' is provided" do
+          let(:options) { { exclude_labels: %w[BAD BOO] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
+
+        context "when 'add_issues_wo_labels' is false" do
+          let(:options) { { add_issues_wo_labels: false } }
+          let(:expected_issues) { [bad_issue, good_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+
+          context "with 'exclude_labels'" do
+            let(:options) { { add_issues_wo_labels: false, exclude_labels: %w[GOOD] } }
+            let(:expected_issues) { [bad_issue] }
+
+            it { is_expected.to eq(expected_issues) }
+          end
+
+          context "with 'include_labels'" do
+            let(:options) { { add_issues_wo_labels: false, include_labels: %w[GOOD] } }
+            let(:expected_issues) { [good_issue] }
+
+            it { is_expected.to eq(expected_issues) }
+          end
+        end
+
+        context "when 'include_labels' is specified" do
+          let(:options) { { include_labels: %w[GOOD] } }
+          let(:expected_issues) { [good_issue, unlabeled_issue] }
+
+          it { is_expected.to eq(expected_issues) }
+        end
       end
     end
   end
diff --git a/spec/unit/generator/generator_spec.rb b/spec/unit/generator/generator_spec.rb
new file mode 100644
index 0000000..7573c44
--- /dev/null
+++ b/spec/unit/generator/generator_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "github_changelog_generator/generator/generator"
+
+RSpec.describe GitHubChangelogGenerator::Generator do
+  let(:header) { "# Changelog" }
+  let(:generator) { described_class.new({ header: header }) }
+  let(:content) do
+    <<~'BASE'
+      ## [1.3.10](https://github.com/xxx/yyy/tree/1.3.10) (2015-03-18)
+
+      [Full Changelog](https://github.com/xxx/yyy/compare/1.3.9...1.3.10)
+
+      **Fixed bugs:**
+
+
+    BASE
+  end
+  let(:footer) do
+    <<~CREDIT
+      \\* *This Changelog was automatically generated \
+      by [github_changelog_generator]\
+      (https://github.com/github-changelog-generator/github-changelog-generator)*
+    CREDIT
+  end
+
+  context "when the given base file has previously appended template messages" do
+    describe "#remove_old_fixed_string" do
+      it "removes old template headers and footers" do
+        log = +"#{header}\n\n#{header}\n#{header}#{content}\n\n#{footer}\n#{footer}#{footer}"
+
+        expect(generator.send(:remove_old_fixed_string, log)).to eq content
+      end
+    end
+  end
+
+  context "when plain contents string was given" do
+    describe "#insert_fixed_string" do
+      it "append template messages at header and footer" do
+        log = String.new(content)
+        ans = "#{header}\n\n#{content}\n\n#{footer}"
+
+        expect(generator.send(:insert_fixed_string, log)).to eq ans
+      end
+    end
+  end
+end
diff --git a/spec/unit/generator/generator_tags_spec.rb b/spec/unit/generator/generator_tags_spec.rb
index 42764af..872334e 100644
--- a/spec/unit/generator/generator_tags_spec.rb
+++ b/spec/unit/generator/generator_tags_spec.rb
@@ -13,6 +13,33 @@ def tags_from_strings(tags_strings)
     end
   end
 
+  describe "#detect_link_tag_time" do
+    let(:newer_tag) { nil }
+
+    let(:default_options) { GitHubChangelogGenerator::Parser.default_options.merge(verbose: false) }
+    let(:options) do
+      {
+        future_release: "2.0.0"
+      }
+    end
+    let(:generator) { described_class.new(default_options.merge(options)) }
+
+    subject do
+      generator.detect_link_tag_time(newer_tag)
+    end
+
+    context "When the local date is not the same as the UTC date" do
+      before do
+        # 2020-12-27T17:00:00-10:00 is 2020-12-28T03:00:00Z.
+        # GitHub API date & time use UTC, so this instant when converted as a
+        # date should be 2020-12-28.
+        expect(Time).to receive(:new).and_return(Time.new(2020, 12, 27, 17, 0, 0, "-10:00"))
+      end
+
+      it { is_expected.to eq(["2.0.0", "2.0.0", Time.gm(2020, 12, 28, 3)]) }
+    end
+  end
+
   describe "#tag_section_mapping" do
     let(:all_tags) { tags_from_strings(%w[8 7 6 5 4 3 2 1]) }
     let(:sorted_tags) { all_tags }
@@ -57,10 +84,10 @@ def tags_from_strings(tags_strings)
     shared_examples_for "a changelog with some exclusions" do
       let(:expected_mapping) do
         {
-          tag_with_name("8") => [tag_with_name("7"), tag_with_name("8")],
-          tag_with_name("6") => [tag_with_name("5"), tag_with_name("6")],
+          tag_with_name("8") => [tag_with_name("6"), tag_with_name("8")],
+          tag_with_name("6") => [tag_with_name("4"), tag_with_name("6")],
           tag_with_name("4") => [tag_with_name("3"), tag_with_name("4")],
-          tag_with_name("3") => [tag_with_name("2"), tag_with_name("3")],
+          tag_with_name("3") => [tag_with_name("1"), tag_with_name("3")],
           tag_with_name("1") => [nil, tag_with_name("1")]
         }
       end
@@ -130,6 +157,22 @@ def tags_from_strings(tags_strings)
     end
   end
 
+  describe "#filter_included_tags_regex" do
+    subject { generator.filter_included_tags(tags_from_strings(%w[1 2 3])) }
+
+    context "with matching regex" do
+      let(:generator) { GitHubChangelogGenerator::Generator.new(include_tags_regex: "[23]") }
+      it { is_expected.to be_a Array }
+      it { is_expected.to match_array(tags_from_strings(%w[2 3])) }
+    end
+
+    context "with non-matching regex" do
+      let(:generator) { GitHubChangelogGenerator::Generator.new(include_tags_regex: "[45]") }
+      it { is_expected.to be_a Array }
+      it { is_expected.to match_array(tags_from_strings(%w[])) }
+    end
+  end
+
   describe "#filter_excluded_tags" do
     subject { generator.filter_excluded_tags(tags_from_strings(%w[1 2 3])) }
 
diff --git a/spec/unit/generator/section_spec.rb b/spec/unit/generator/section_spec.rb
new file mode 100644
index 0000000..369d530
--- /dev/null
+++ b/spec/unit/generator/section_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module GitHubChangelogGenerator
+  RSpec.describe Section do
+    let(:options) { {} }
+    subject(:section) { described_class.new(options) }
+
+    describe "#encapsulate_string" do
+      let(:string) { "" }
+
+      context "with the empty string" do
+        it "returns the string" do
+          expect(section.send(:encapsulate_string, string)).to eq string
+        end
+      end
+
+      context "with a string with an escape-needing character in it" do
+        let(:string) { "<Inside> and outside" }
+
+        it "returns the string escaped" do
+          expect(section.send(:encapsulate_string, string)).to eq '\\<Inside\\> and outside'
+        end
+      end
+
+      context "with a backticked string with an escape-needing character in it" do
+        let(:string) { 'back `\` slash' }
+
+        it "returns the string" do
+          expect(section.send(:encapsulate_string, string)).to eq 'back `\` slash'
+        end
+      end
+    end
+  end
+end
diff --git a/spec/unit/gitlab_fetcher_spec.rb b/spec/unit/gitlab_fetcher_spec.rb
index 1935206..95fb35f 100644
--- a/spec/unit/gitlab_fetcher_spec.rb
+++ b/spec/unit/gitlab_fetcher_spec.rb
@@ -37,7 +37,7 @@
   end
 
   describe "#fetch_auth_token" do
-    token = GitLabChangelogGenerator::GitlabFetcher::CHANGELOG_AUTH_TOKEN
+    token = GitLabChangelogGenerator::GitlabFetcher::CHANGELOG_GITHUB_TOKEN
     context "when token in ENV exist" do
       before { stub_const("ENV", ENV.to_hash.merge(token => VALID_TOKEN)) }
       subject { fetcher.send(:fetch_auth_token) }
@@ -102,39 +102,39 @@
     # TODO: swap for Gitlab API
     context "when API call is valid", :vcr do
       it "should return tags" do
-        expected_tags = [{ "name"        => "v0.0.3",
+        expected_tags = [{ "name" => "v0.0.3",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.3",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.3",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90" } },
-                         { "name"        => "v0.0.2",
+                         { "name" => "v0.0.2",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.2",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.2",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "9b35bb13dcd15b68e7bcbf10cde5eb937a54f710",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/9b35bb13dcd15b68e7bcbf10cde5eb937a54f710" } },
-                         { "name"        => "v0.0.1",
+                         { "name" => "v0.0.1",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.1",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.1",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "4c2d6d1ed58bdb24b870dcb5d9f2ceed0283d69d",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/4c2d6d1ed58bdb24b870dcb5d9f2ceed0283d69d" } },
-                         { "name"        => "0.0.4",
+                         { "name" => "0.0.4",
                            "zipball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/zipball/0.0.4",
                            "tarball_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/tarball/0.0.4",
-                           "commit"      =>
+                           "commit" =>
                              { "sha" => "ece0c3ab7142b21064b885061c55ede00ef6ce94",
                                "url" =>
                                  "https://api.github.com/repos/skywinder/changelog_test/commits/ece0c3ab7142b21064b885061c55ede00ef6ce94" } }]
@@ -160,50 +160,50 @@
       it "returns issue with proper key/values" do
         issues, _pull_requests = fetcher.fetch_closed_issues_and_pr
 
-        expected_issue = { "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
+        expected_issue = { "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
                            "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                           "labels_url"     =>
+                           "labels_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/labels{/name}",
-                           "comments_url"   =>
+                           "comments_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/comments",
-                           "events_url"     =>
+                           "events_url" =>
                              "https://api.github.com/repos/skywinder/changelog_test/issues/14/events",
-                           "html_url"       => "https://github.com/skywinder/changelog_test/issues/14",
-                           "id"             => 95_419_412,
-                           "number"         => 14,
-                           "title"          => "Issue closed from commit from PR",
-                           "user"           =>
-                             { "login"               => "skywinder",
-                               "id"                  => 3_356_474,
-                               "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                               "gravatar_id"         => "",
-                               "url"                 => "https://api.github.com/users/skywinder",
-                               "html_url"            => "https://github.com/skywinder",
-                               "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                               "following_url"       =>
+                           "html_url" => "https://github.com/skywinder/changelog_test/issues/14",
+                           "id" => 95_419_412,
+                           "number" => 14,
+                           "title" => "Issue closed from commit from PR",
+                           "user" =>
+                             { "login" => "skywinder",
+                               "id" => 3_356_474,
+                               "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                               "gravatar_id" => "",
+                               "url" => "https://api.github.com/users/skywinder",
+                               "html_url" => "https://github.com/skywinder",
+                               "followers_url" => "https://api.github.com/users/skywinder/followers",
+                               "following_url" =>
                                  "https://api.github.com/users/skywinder/following{/other_user}",
-                               "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                               "starred_url"         =>
+                               "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                               "starred_url" =>
                                  "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                               "subscriptions_url"   => "https://api.github.com/users/skywinder/subscriptions",
-                               "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                               "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                               "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                               "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions",
+                               "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                               "repos_url" => "https://api.github.com/users/skywinder/repos",
+                               "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                                "received_events_url" =>
                                  "https://api.github.com/users/skywinder/received_events",
-                               "type"                => "User",
-                               "site_admin"          => false },
-                           "labels"         => [],
-                           "state"          => "closed",
-                           "locked"         => false,
-                           "assignee"       => nil,
+                               "type" => "User",
+                               "site_admin" => false },
+                           "labels" => [],
+                           "state" => "closed",
+                           "locked" => false,
+                           "assignee" => nil,
                            "assignees" => [],
-                           "milestone"      => nil,
-                           "comments"       => 0,
-                           "created_at"     => "2015-07-16T12:06:08Z",
-                           "updated_at"     => "2015-07-16T12:21:42Z",
-                           "closed_at"      => "2015-07-16T12:21:42Z",
-                           "body"           => "" }
+                           "milestone" => nil,
+                           "comments" => 0,
+                           "created_at" => "2015-07-16T12:06:08Z",
+                           "updated_at" => "2015-07-16T12:21:42Z",
+                           "closed_at" => "2015-07-16T12:21:42Z",
+                           "body" => "" }
 
         # Convert times to Time
         expected_issue.each_pair do |k, v|
@@ -216,55 +216,55 @@
       it "returns pull request with proper key/values" do
         _issues, pull_requests = fetcher.fetch_closed_issues_and_pr
 
-        expected_pr = { "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/21",
+        expected_pr = { "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/21",
                         "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                        "labels_url"     =>
+                        "labels_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/labels{/name}",
-                        "comments_url"   =>
+                        "comments_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/comments",
-                        "events_url"     =>
+                        "events_url" =>
                           "https://api.github.com/repos/skywinder/changelog_test/issues/21/events",
-                        "html_url"       => "https://github.com/skywinder/changelog_test/pull/21",
-                        "id"             => 124_925_759,
-                        "number"         => 21,
-                        "title"          => "Merged br (should appear in change log with  #20)",
-                        "user"           =>
-                          { "login"               => "skywinder",
-                            "id"                  => 3_356_474,
-                            "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                            "gravatar_id"         => "",
-                            "url"                 => "https://api.github.com/users/skywinder",
-                            "html_url"            => "https://github.com/skywinder",
-                            "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                            "following_url"       =>
+                        "html_url" => "https://github.com/skywinder/changelog_test/pull/21",
+                        "id" => 124_925_759,
+                        "number" => 21,
+                        "title" => "Merged br (should appear in change log with  #20)",
+                        "user" =>
+                          { "login" => "skywinder",
+                            "id" => 3_356_474,
+                            "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                            "gravatar_id" => "",
+                            "url" => "https://api.github.com/users/skywinder",
+                            "html_url" => "https://github.com/skywinder",
+                            "followers_url" => "https://api.github.com/users/skywinder/followers",
+                            "following_url" =>
                               "https://api.github.com/users/skywinder/following{/other_user}",
-                            "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                            "starred_url"         =>
+                            "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                            "starred_url" =>
                               "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                            "subscriptions_url"   => "https://api.github.com/users/skywinder/subscriptions",
-                            "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                            "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                            "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                            "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions",
+                            "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                            "repos_url" => "https://api.github.com/users/skywinder/repos",
+                            "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                             "received_events_url" =>
                               "https://api.github.com/users/skywinder/received_events",
-                            "type"                => "User",
-                            "site_admin"          => false },
-                        "labels"         => [],
-                        "state"          => "closed",
-                        "locked"         => false,
-                        "assignee"       => nil,
+                            "type" => "User",
+                            "site_admin" => false },
+                        "labels" => [],
+                        "state" => "closed",
+                        "locked" => false,
+                        "assignee" => nil,
                         "assignees" => [],
-                        "milestone"      => nil,
-                        "comments"       => 0,
-                        "created_at"     => "2016-01-05T09:24:08Z",
-                        "updated_at"     => "2016-01-05T09:26:53Z",
-                        "closed_at"      => "2016-01-05T09:24:27Z",
-                        "pull_request"   =>
-                          { "url"       => "https://api.github.com/repos/skywinder/changelog_test/pulls/21",
-                            "html_url"  => "https://github.com/skywinder/changelog_test/pull/21",
-                            "diff_url"  => "https://github.com/skywinder/changelog_test/pull/21.diff",
+                        "milestone" => nil,
+                        "comments" => 0,
+                        "created_at" => "2016-01-05T09:24:08Z",
+                        "updated_at" => "2016-01-05T09:26:53Z",
+                        "closed_at" => "2016-01-05T09:24:27Z",
+                        "pull_request" =>
+                          { "url" => "https://api.github.com/repos/skywinder/changelog_test/pulls/21",
+                            "html_url" => "https://github.com/skywinder/changelog_test/pull/21",
+                            "diff_url" => "https://github.com/skywinder/changelog_test/pull/21.diff",
                             "patch_url" => "https://github.com/skywinder/changelog_test/pull/21.patch" },
-                        "body"           =>
+                        "body" =>
                           "to test https://github.com/skywinder/github-changelog-generator/pull/305\r\nshould appear in change log with #20" }
 
         # Convert times to Time
@@ -308,51 +308,52 @@
   describe "#fetch_events_async" do
     context "when API call is valid", :vcr do
       it "populates issues" do
-        issues = [{ "url"            => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
+        issues = [{ "url" => "https://api.github.com/repos/skywinder/changelog_test/issues/14",
                     "repository_url" => "https://api.github.com/repos/skywinder/changelog_test",
-                    "labels_url"     =>
+                    "labels_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/labels{/name}",
-                    "comments_url"   =>
+                    "comments_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/comments",
-                    "events_url"     =>
+                    "events_url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/issues/14/events",
-                    "html_url"       => "https://github.com/skywinder/changelog_test/issues/14",
-                    "id"             => 95_419_412,
-                    "number"         => 14,
-                    "title"          => "Issue closed from commit from PR",
-                    "user"           =>
-                      { "login"               => "skywinder",
-                        "id"                  => 3_356_474,
-                        "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                        "gravatar_id"         => "",
-                        "url"                 => "https://api.github.com/users/skywinder",
-                        "html_url"            => "https://github.com/skywinder",
-                        "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                        "following_url"       =>
+                    "html_url" => "https://github.com/skywinder/changelog_test/issues/14",
+                    "id" => 95_419_412,
+                    "number" => 14,
+                    "title" => "Issue closed from commit from PR",
+                    "user" =>
+                      { "login" => "skywinder",
+                        "id" => 3_356_474,
+                        "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                        "gravatar_id" => "",
+                        "url" => "https://api.github.com/users/skywinder",
+                        "html_url" => "https://github.com/skywinder",
+                        "followers_url" => "https://api.github.com/users/skywinder/followers",
+                        "following_url" =>
                           "https://api.github.com/users/skywinder/following{/other_user}",
-                        "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                        "starred_url"         =>
+                        "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                        "starred_url" =>
                           "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                        "subscriptions_url"   =>
+                        "subscriptions_url" =>
                           "https://api.github.com/users/skywinder/subscriptions",
-                        "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                        "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                        "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                        "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                        "repos_url" => "https://api.github.com/users/skywinder/repos",
+                        "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                         "received_events_url" =>
                           "https://api.github.com/users/skywinder/received_events",
-                        "type"                => "User",
-                        "site_admin"          => false },
-                    "labels"         => [],
-                    "state"          => "closed",
-                    "locked"         => false,
-                    "assignee"       => nil,
+                        "type" => "User",
+                        "site_admin" => false },
+                    "labels" => [],
+                    "state" => "closed",
+                    "locked" => false,
+                    "assignee" => nil,
                     "assignees" => [],
-                    "milestone"      => nil,
-                    "comments"       => 0,
-                    "created_at"     => "2015-07-16T12:06:08Z",
-                    "updated_at"     => "2015-07-16T12:21:42Z",
-                    "closed_at"      => "2015-07-16T12:21:42Z",
-                    "body"           => "" }]
+                    "milestone" => nil,
+                    "comments" => 0,
+                    "created_at" => "2015-07-16T12:06:08Z",
+                    "updated_at" => "2015-07-16T12:21:42Z",
+                    "closed_at" => "2015-07-16T12:21:42Z",
+                    "body" => "" }]
+
 
         # Check that they are blank to begin with
         expect(issues.first["events"]).to be_nil
@@ -360,63 +361,64 @@
         fetcher.fetch_events_async(issues)
         issue_events = issues.first["events"]
 
-        expected_events = [{ "id"         => 357_462_189,
-                             "url"        =>
+        expected_events = [{ "id" => 357_462_189,
+                             "url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462189",
-                             "actor"      =>
-                               { "login"               => "skywinder",
-                                 "id"                  => 3_356_474,
-                                 "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                                 "gravatar_id"         => "",
-                                 "url"                 => "https://api.github.com/users/skywinder",
-                                 "html_url"            => "https://github.com/skywinder",
-                                 "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                                 "following_url"       =>
+                             "actor" =>
+                               { "login" => "skywinder",
+                                 "id" => 3_356_474,
+                                 "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                                 "gravatar_id" => "",
+                                 "url" => "https://api.github.com/users/skywinder",
+                                 "html_url" => "https://github.com/skywinder",
+                                 "followers_url" => "https://api.github.com/users/skywinder/followers",
+                                 "following_url" =>
                                    "https://api.github.com/users/skywinder/following{/other_user}",
-                                 "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                                 "starred_url"         =>
+                                 "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                                 "starred_url" =>
                                    "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                                 "subscriptions_url"   =>
+                                 "subscriptions_url" =>
                                    "https://api.github.com/users/skywinder/subscriptions",
-                                 "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                                 "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                                 "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                                 "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                                 "repos_url" => "https://api.github.com/users/skywinder/repos",
+                                 "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                                  "received_events_url" =>
                                    "https://api.github.com/users/skywinder/received_events",
-                                 "type"                => "User",
-                                 "site_admin"          => false },
-                             "event"      => "referenced",
-                             "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                                 "type" => "User",
+                                 "site_admin" => false },
+                             "event" => "referenced",
+                             "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
                              "commit_url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                              "created_at" => "2015-07-16T12:21:16Z" },
-                           { "id"         => 357_462_542,
-                             "url"        =>
+                           { "id" => 357_462_542,
+                             "url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462542",
-                             "actor"      =>
-                               { "login"               => "skywinder",
-                                 "id"                  => 3_356_474,
-                                 "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                                 "gravatar_id"         => "",
-                                 "url"                 => "https://api.github.com/users/skywinder",
-                                 "html_url"            => "https://github.com/skywinder",
-                                 "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                                 "following_url"       =>
+                             "actor" =>
+                               { "login" => "skywinder",
+                                 "id" => 3_356_474,
+                                 "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                                 "gravatar_id" => "",
+                                 "url" => "https://api.github.com/users/skywinder",
+                                 "html_url" => "https://github.com/skywinder",
+                                 "followers_url" => "https://api.github.com/users/skywinder/followers",
+                                 "following_url" =>
                                    "https://api.github.com/users/skywinder/following{/other_user}",
-                                 "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                                 "starred_url"         =>
+                                 "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                                 "starred_url" =>
                                    "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                                 "subscriptions_url"   =>
+                                 "subscriptions_url" =>
                                    "https://api.github.com/users/skywinder/subscriptions",
-                                 "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                                 "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                                 "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                                 "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                                 "repos_url" => "https://api.github.com/users/skywinder/repos",
+                                 "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                                  "received_events_url" =>
                                    "https://api.github.com/users/skywinder/received_events",
-                                 "type"                => "User",
-                                 "site_admin"          => false },
-                             "event"      => "closed",
-                             "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                                 "type" => "User",
+                                 "site_admin" => false },
+                             "event" => "closed",
+                             "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
+
                              "commit_url" =>
                                "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                              "created_at" => "2015-07-16T12:21:42Z" }]
@@ -436,12 +438,12 @@
   describe "#fetch_date_of_tag" do
     context "when API call is valid", :vcr do
       it "returns date" do
-        tag = { "name"        => "v0.0.3",
+        tag = { "name" => "v0.0.3",
                 "zipball_url" =>
                   "https://api.github.com/repos/skywinder/changelog_test/zipball/v0.0.3",
                 "tarball_url" =>
                   "https://api.github.com/repos/skywinder/changelog_test/tarball/v0.0.3",
-                "commit"      =>
+                "commit" =>
                   { "sha" => "a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90",
                     "url" =>
                       "https://api.github.com/repos/skywinder/changelog_test/commits/a0cba2b1a1ea9011ab07ee1ac140ba5a5eb8bd90" } }
@@ -469,32 +471,33 @@
   describe "#fetch_commit" do
     context "when API call is valid", :vcr do
       it "returns commit" do
-        event = { "id"         => 357_462_189,
-                  "url"        =>
+        event = { "id" => 357_462_189,
+                  "url" =>
                     "https://api.github.com/repos/skywinder/changelog_test/issues/events/357462189",
-                  "actor"      =>
-                    { "login"               => "skywinder",
-                      "id"                  => 3_356_474,
-                      "avatar_url"          => "https://avatars.githubusercontent.com/u/3356474?v=3",
-                      "gravatar_id"         => "",
-                      "url"                 => "https://api.github.com/users/skywinder",
-                      "html_url"            => "https://github.com/skywinder",
-                      "followers_url"       => "https://api.github.com/users/skywinder/followers",
-                      "following_url"       =>
+                  "actor" =>
+                    { "login" => "skywinder",
+                      "id" => 3_356_474,
+                      "avatar_url" => "https://avatars.githubusercontent.com/u/3356474?v=3",
+                      "gravatar_id" => "",
+                      "url" => "https://api.github.com/users/skywinder",
+                      "html_url" => "https://github.com/skywinder",
+                      "followers_url" => "https://api.github.com/users/skywinder/followers",
+                      "following_url" =>
                         "https://api.github.com/users/skywinder/following{/other_user}",
-                      "gists_url"           => "https://api.github.com/users/skywinder/gists{/gist_id}",
-                      "starred_url"         =>
+                      "gists_url" => "https://api.github.com/users/skywinder/gists{/gist_id}",
+                      "starred_url" =>
                         "https://api.github.com/users/skywinder/starred{/owner}{/repo}",
-                      "subscriptions_url"   => "https://api.github.com/users/skywinder/subscriptions",
-                      "organizations_url"   => "https://api.github.com/users/skywinder/orgs",
-                      "repos_url"           => "https://api.github.com/users/skywinder/repos",
-                      "events_url"          => "https://api.github.com/users/skywinder/events{/privacy}",
+                      "subscriptions_url" => "https://api.github.com/users/skywinder/subscriptions",
+                      "organizations_url" => "https://api.github.com/users/skywinder/orgs",
+                      "repos_url" => "https://api.github.com/users/skywinder/repos",
+                      "events_url" => "https://api.github.com/users/skywinder/events{/privacy}",
                       "received_events_url" =>
                         "https://api.github.com/users/skywinder/received_events",
-                      "type"                => "User",
-                      "site_admin"          => false },
-                  "event"      => "referenced",
-                  "commit_id"  => "decfe840d1a1b86e0c28700de5362d3365a29555",
+                      "type" => "User",
+                      "site_admin" => false },
+                  "event" => "referenced",
+                  "commit_id" => "decfe840d1a1b86e0c28700de5362d3365a29555",
+
                   "commit_url" =>
                     "https://api.github.com/repos/skywinder/changelog_test/commits/decfe840d1a1b86e0c28700de5362d3365a29555",
                   "created_at" => "2015-07-16T12:21:16Z" }
diff --git a/spec/unit/octo_fetcher_spec.rb b/spec/unit/octo_fetcher_spec.rb
index 29b18ff..382f7be 100644
--- a/spec/unit/octo_fetcher_spec.rb
+++ b/spec/unit/octo_fetcher_spec.rb
@@ -85,6 +85,49 @@
     end
   end
 
+  describe "#fetch_tag_shas" do
+    let(:commits) do
+      [
+        { sha: "0", parents: [{ sha: "1" }, { sha: "6" }] },
+        { sha: "1", parents: [{ sha: "2" }] },
+        { sha: "2", parents: [{ sha: "3" }] },
+        { sha: "3", parents: [{ sha: "4" }] },
+        { sha: "4", parents: [{ sha: "5" }] },
+        { sha: "5", parents: [] },
+        { sha: "6", parents: [{ sha: "7" }, { sha: "8" }] },
+        { sha: "7", parents: [{ sha: "9" }, { sha: "10" }] },
+        { sha: "8", parents: [{ sha: "11" }, { sha: "12" }] },
+        { sha: "9", parents: [] },
+        { sha: "10", parents: [] },
+        { sha: "11", parents: [] },
+        { sha: "12", parents: [] }
+      ]
+    end
+
+    let(:tag0) { { "name" => "tag-0", "commit" => { "sha" => "0" } } }
+    let(:tag1) { { "name" => "tag-1", "commit" => { "sha" => "1" } } }
+    let(:tag6) { { "name" => "tag-6", "commit" => { "sha" => "6" } } }
+
+    before do
+      allow(fetcher).to receive(:commits).and_return(commits)
+    end
+
+    it "should find all shas with single parents" do
+      fetcher.fetch_tag_shas([tag1])
+      expect(tag1["shas_in_tag"]).to eq(Set.new(%w[1 2 3 4 5]))
+    end
+
+    it "should find all shas with multiple parents" do
+      fetcher.fetch_tag_shas([tag6])
+      expect(tag6["shas_in_tag"]).to eq(Set.new(%w[6 7 8 9 10 11 12]))
+    end
+
+    it "should find all shas with mixed parents" do
+      fetcher.fetch_tag_shas([tag0])
+      expect(tag0["shas_in_tag"]).to eq(Set.new(%w[0 1 2 3 4 5 6 7 8 9 10 11 12]))
+    end
+  end
+
   describe "#github_fetch_tags" do
     context "when wrong token provided", :vcr do
       let(:options) do
@@ -207,7 +250,7 @@
 
         # Convert times to Time
         expected_issue.each_pair do |k, v|
-          expected_issue[k] = Time.parse(v) if v.to_s =~ /^2015-/
+          expected_issue[k] = Time.parse(v) if v.to_s.start_with?("2015-")
         end
 
         expect(issues.first).to eq(expected_issue)
@@ -269,7 +312,7 @@
 
         # Convert times to Time
         expected_pr.each_pair do |k, v|
-          expected_pr[k] = Time.parse(v) if v.to_s =~ /^2016-01/
+          expected_pr[k] = Time.parse(v) if v.to_s.start_with?("2016-01")
         end
 
         expect(pull_requests.first).to eq(expected_pr)