Repository: sendgrid/sendgrid-python

Issue:
Convert integer Substitution values to strings
#### Issue Summary

https://github.com/sendgrid/sendgrid-python/issues/187

https://github.com/sendgrid/sendgrid-python/blob/master/sendgrid/helpers/mail/substitution.py#L45

Discussion:

Patch:
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index 1ac1c99..0000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,17 +0,0 @@
-#### Issue Summary
-
-A summary of the issue and the environment in which it occurs. If suitable, include the steps required to reproduce the bug. Please feel free to include screenshots, screencasts, code examples.
-
-
-#### Steps to Reproduce
-
-1. This is the first step
-2. This is the second step
-3. Further steps, etc.
-
-Any other information you want to share that is relevant to the issue being reported. Especially, why do you consider this to be a bug? What do you expect to happen instead?
-
-#### Technical details:
-
-* sendgrid-python Version: master (latest commit: [commit number])
-* Python Version: X.X
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
deleted file mode 100644
index caf28d9..0000000
--- a/.github/PULL_REQUEST_TEMPLATE
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-We appreciate the effort for this pull request, but before that, please make sure you read the [contribution guidelines](https://github.com/sendgrid/sendgrid-python/blob/v4/CONTRIBUTING.md), and then fill out the blanks below.
-
-**All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.**
-
-Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
-e.g. 
-Fixes #1
-Closes #2
--->
-# Fixes #X
-
-### Checklist
-- [ ] I acknowledge that all my contributions will be made under the project's license
-- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
-- [ ] I have read the [Contribution Guide] and my PR follows them
-- [ ] I updated my branch with the master branch
-- [ ] I have added tests that prove my fix is effective or that my feature works
-- [ ] I have added necessary documentation about the functionality in the appropriate .md file
-- [ ] I have added in line documentation to the code I modified
-
-### Short description of what this PR does:
-- 
-
-If you have questions, please send an email to [Twilio SendGrid](mailto:dx@sendgrid.com), or file a GitHub Issue in this repository.
diff --git a/.travis.yml b/.travis.yml
index 872bd38..6d42ff9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,9 @@ language: python
 sudo: false
 cache: pip
 python:
-- '2.7'
-- '3.4'
-- '3.5'
-- '3.6'
+  - '2.7'
+  - '3.5'
+  - '3.6'
 # Enable 3.7 without globally enabling sudo and dist: xenial for other build jobs
 matrix:
   include:
@@ -14,47 +13,28 @@ matrix:
       sudo: true
 env:
   global:
-    - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN
+    - CC_TEST_REPORTER_ID=$TRAVIS_CODE_CLIMATE_TOKEN SENDGRID_API_KEY=SGAPIKEY
 install:
-- python setup.py install
-- pip install pyyaml
-- pip install flask
-- pip install six
-- pip install coverage
-- pip install codecov
-# - sudo apt-get install -y pandoc
-addons:
-  apt_packages:
-    - pandoc
+  - make install
+  - make test-install
 before_script:
-- "./test/prism.sh &"
-- sleep 20
-- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-- chmod +x ./cc-test-reporter
-- ./cc-test-reporter before-build
+  - "./test/prism.sh &"
+  - sleep 20
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
 script:
-- coverage run -m unittest discover
+  - . venv/bin/activate; coverage run -m unittest discover
 after_script:
-- codecov
-- ./cc-test-reporter after-build --exit-code $?
-# deploy:
-#   provider: pypi
-#   user: thinkingserious
-#   password:
-#     secure: DoM21KiMKkt/7AS6zOqTs7j3fgInrpswRTPG3cqBNRSzyfkXeXmKecCPruooxvYKLM7fPNDOuIH2phgCjdx/XBtJwghNh34n+TzhNFEiI/6pV0iS4a9gW0+QU+GMYvQmfNlA9DKQ5N20FMy4XeK8QQFarJXQwW1/a5wWftbUYvQ=
-#   skip_cleanup: true
-#   distributions: sdist bdist_wheel
-#   on:
-#     tags: true
-#     python: '3.6'
-notifications:
-  hipchat:
-    rooms:
-      secure: Lo3L/YNWpn9ulGX4D2HlWrBOyxMPlLkFcwxbYViG69Ta6BV+c6YE+Pct43tExlL6sZ+nj5p8X4KRTeOM4sqASrebWA25nyUrNTm+vZYFbi5XfmGvvi8TEsgg0MYRQRWWn/R2z0kZW/fqOY6sqJuoIafMBmC3tayTJRiH1Ct2Cw0=
-    template:
-    - '<a href="https://travis-ci.org/%{repository}/builds/%{build_id}">%{repository}
-      Build %{build_number}</a> on branch <i>%{branch}</i> by %{author}: <strong>%{message}</strong>
-      <a href="https://github.com/%{repository}/commits/%{commit}">View on
-      GitHub</a>'
-    format: html
-    notify: false
+  - . venv/bin/activate; codecov
+  - ./cc-test-reporter after-build --exit-code $?
+deploy:
+  provider: pypi
+  user: __token__
+  password:
+    secure: $PYPI_TOKEN
+  skip_cleanup: true
+  distributions: sdist bdist_wheel
+  on:
+    tags: true
+    python: '3.6'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 755e5f0..088b20f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,32 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+[2020-01-24] Version 6.1.1
+--------------------------
+**Library - Docs**
+- [PR #865](https://github.com/sendgrid/sendgrid-python/pull/865): baseline all the templated markdown docs. Thanks to [@childish-sambino](https://github.com/childish-sambino)!
+
+**Library - Chore**
+- [PR #853](https://github.com/sendgrid/sendgrid-python/pull/853): clean up imports. Thanks to [@DucarrougeR](https://github.com/DucarrougeR)!
+- [PR #862](https://github.com/sendgrid/sendgrid-python/pull/862): prep the repo for automated releasing. Thanks to [@eshanholtz](https://github.com/eshanholtz)!
+
+**Library - Fix**
+- [PR #863](https://github.com/sendgrid/sendgrid-python/pull/863): improve make test command. Thanks to [@eshanholtz](https://github.com/eshanholtz)!
+
+
+[2019-09-12] Version 6.1.0
+---------------------------
+
+### Added
+- Bumped dependency on python-http-client to [v3.2.1](https://github.com/sendgrid/python-http-client/releases/tag/v3.2.0)
+- [PR #807](https://github.com/sendgrid/sendgrid-python/pull/807): Get version from version.py instead of version.txt. (BIG thanks to [@lipis](https://github.com/lipis))
+- [PR #808](https://github.com/sendgrid/sendgrid-python/pull/808): API key permissions mention in USAGE.md. (BIG thanks to [@int-ua](https://github.com/int-ua))
+
+### Fixed
+- [PR #763](https://github.com/sendgrid/sendgrid-python/pull/763): Updated Error Message Section. (BIG thanks to [@FFX01](https://github.com/FFX01))
+- [PR #818](https://github.com/sendgrid/sendgrid-python/pull/818): Handle new API in the helper example. (BIG thanks to [@enugentdt](https://github.com/enugentdt))
+- [PR #839](https://github.com/sendgrid/sendgrid-python/pull/839): Fix for ganalytics json builder.
+
 ## [6.0.5] - 2019-05-01 ##
 
 ### Fixed
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 52e42a1..2f0727e 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,38 +1,73 @@
-# Twilio SendGrid Community Code of Conduct
- 
- The Twilio SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.
- 
- ### Be Open
- Members of the community are open to collaboration, whether it's on pull requests, code reviews, approvals, issues or otherwise. We're receptive to constructive comments and criticism, as the experiences and skill sets of all members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate, and everyone can make a difference.
+# Contributor Covenant Code of Conduct
 
- ### Be Considerate
- Members of the community are considerate of their peers, which include other contributors and users of Twilio SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
+## Our Pledge
 
- ### Be Respectful
- Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Twilio SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues.  Overall, we're good with each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
 
- ## Additional Guidance
+## Our Standards
 
- ### Disclose Potential Conflicts of Interest
- Community discussions often involve interested parties. We expect participants to be aware when they are conflicted due to employment or other projects they are involved in and disclose those interests to other project members. When in doubt, over-disclose. Perceived conflicts of interest are important to address so that the community’s decisions are credible even when unpopular, difficult or favorable to the interests of one group over another.
+Examples of behavior that contributes to creating a positive environment
+include:
 
- ### Interpretation
- This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter.  When in doubt, try to abide by [Twilio SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.
- 
- ### Enforcement
- Most members of the Twilio SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
- ## If you have concerns about someone’s conduct
- **Initiate Direct Contact** - It is always appropriate to email a community member (if contact information is available), mention that you think their behavior was out of line, and (if necessary) point them to this Code.
+Examples of unacceptable behavior by participants include:
 
- **Discuss Publicly** - Discussing publicly is always acceptable. Note, though, that approaching the person directly may be better, as it tends to make them less defensive, and it respects the time of other community members, so you probably want to try direct contact first.
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
- **Contact the Moderators** - You can reach the Twilio SendGrid moderators by emailing dx@sendgrid.com.
- 
- ## Attribution
+## Our Responsibilities
 
- Twilio SendGrid thanks the following, on which it draws for content and inspiration:
- 
-* [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct)
-* [Open Source Initiative General Code of Conduct](https://opensource.org/codeofconduct)
-* [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at open-source@twilio.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5f94449..1c931fa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,7 +55,7 @@ Before you decide to create a new issue, please try the following:
 
 ### Please use our Bug Report Template
 
-In order to make the process easier, we've included a [sample bug report template]((https://github.com/sendgrid/sendgrid-python/.github/ISSUE_TEMPLATE)) (borrowed from [Ghost](https://github.com/TryGhost/Ghost/)). The template uses [GitHub flavored markdown](https://help.github.com/articles/github-flavored-markdown/) for formatting.
+In order to make the process easier, we've included a [sample bug report template]((https://github.com/sendgrid/sendgrid-python/ISSUE_TEMPLATE.md)) (borrowed from [Ghost](https://github.com/TryGhost/Ghost/)). The template uses [GitHub flavored markdown](https://help.github.com/articles/github-flavored-markdown/) for formatting.
 
 <a name="improvements-to-the-codebase"></a>
 ## Improvements to the Codebase
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..a4b1cc2
--- /dev/null
+++ b/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!--
+If this is a feature request, make sure you search Issues for an existing request before creating a new one!
+-->
+
+### Issue Summary
+A summary of the issue and the environment in which it occurs. If suitable, include the steps required to reproduce the bug. Please feel free to include screenshots, screencasts, or code examples.
+
+### Steps to Reproduce
+1. This is the first step
+2. This is the second step
+3. Further steps, etc.
+
+### Code Snippet
+```python
+# paste code here
+```
+
+### Exception/Log
+```
+# paste exception/log here
+```
+
+### Technical details:
+* sendgrid-python version:
+* python version:
+
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..29aba59
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (C) 2020, Twilio SendGrid, Inc. <help@twilio.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index a01fda4..0000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright (c) 2012-2019 Twilio SendGrid, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of
-the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/MANIFEST.in b/MANIFEST.in
index 594e724..f2ec0f7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
 include README.rst
-include LICENSE.txt
+include LICENSE.md
 include app.json
 include Procfile
 include requirements.txt
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0e275b6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: venv install test-install test clean nopyc
+
+venv:
+	@python --version || (echo "Python is not installed, please install Python 2 or Python 3"; exit 1);
+	virtualenv --python=python venv
+
+install: venv
+	. venv/bin/activate; python setup.py install
+	. venv/bin/activate; pip install -r requirements.txt
+
+test-install:
+	. venv/bin/activate; pip install -r test/requirements.txt
+
+test: test-install
+	./test/prism.sh &
+	sleep 2
+	. venv/bin/activate; python -m unittest discover -v
+
+clean: nopyc
+	rm -rf venv
+
+nopyc:
+	find . -name \*.pyc -delete
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..215059a
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,31 @@
+<!--
+We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines, then fill out the blanks below.
+
+Please format the PR title appropriately based on the type of change:
+  <type>[!]: <description>
+Where <type> is one of: docs, chore, feat, fix, test.
+Add a '!' after the type for breaking changes (e.g. feat!: new breaking feature).
+
+**All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.**
+
+Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
+e.g.
+Fixes #1
+Closes #2
+-->
+
+# Fixes #
+
+A short description of what this PR does.
+
+### Checklist
+- [ ] I acknowledge that all my contributions will be made under the project's license
+- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
+- [ ] I have read the [Contribution Guidelines](CONTRIBUTING.md) and my PR follows them
+- [ ] I have titled the PR appropriately
+- [ ] I have updated my branch with the master branch
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have added necessary documentation about the functionality in the appropriate .md file
+- [ ] I have added inline documentation to the code I modified
+
+If you have questions, please file a [support ticket](https://twilio.com/help/contact), or create a GitHub Issue in this repository.
diff --git a/README.rst b/README.rst
index c7c2969..7d78db9 100644
--- a/README.rst
+++ b/README.rst
@@ -1,6 +1,6 @@
 .. image:: https://github.com/sendgrid/sendgrid-python/raw/master/twilio_sendgrid_logo.png
    :target: https://www.sendgrid.com
-   
+
 
 
 |Travis Badge| |codecov| |Python Versions| |PyPI Version| |Docker Badge| |Email Notifications Badge| |MIT licensed| |Twitter Follow| |GitHub contributors| |Open Source Helpers|
@@ -46,7 +46,7 @@ Installation
 Prerequisites
 -------------
 
--  Python version 2.7 and 3.4+
+-  Python version 2.7 and 3.5+
 -  For email, you will need a Twilio SendGrid account, starting at the `free level`_
 -  For SMS messages, you will need a free `Twilio account`_
 
@@ -303,7 +303,7 @@ License
 .. _Sign the CLA to Create a Pull Request: https://cla.sendgrid.com/sendgrid/sendgrid-python
 .. _troubleshooting guide: https://github.com/sendgrid/sendgrid-python/blob/master/TROUBLESHOOTING.md
 .. _Developer Experience Team: mailto:dx@sendgrid.com
-.. _The MIT License (MIT): https://github.com/sendgrid/sendgrid-python/blob/master/LICENSE.txt
+.. _The MIT License (MIT): https://github.com/sendgrid/sendgrid-python/blob/master/LICENSE.md
 
 .. |Travis Badge| image:: https://travis-ci.org/sendgrid/sendgrid-python.svg?branch=master
    :target: https://travis-ci.org/sendgrid/sendgrid-python
@@ -318,7 +318,7 @@ License
 .. |Email Notifications Badge| image:: https://dx.sendgrid.com/badge/python
    :target: https://dx.sendgrid.com/newsletter/python
 .. |MIT licensed| image:: https://img.shields.io/badge/license-MIT-blue.svg
-   :target: ./LICENSE.txt
+   :target: ./LICENSE.md
 .. |Twitter Follow| image:: https://img.shields.io/twitter/follow/sendgrid.svg?style=social&label=Follow
    :target: https://twitter.com/sendgrid
 .. |GitHub contributors| image:: https://img.shields.io/github/contributors/sendgrid/sendgrid-python.svg
diff --git a/docker/README.md b/docker/README.md
index 80001d5..0467daf 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,6 @@
 # Supported tags and respective `Dockerfile` links
- - `v6.0.5`, `latest` [(Dockerfile)](https://github.com/sendgrid/sendgrid-python/blob/master/docker/Dockerfile)
+ - `v6.1.0`, `latest` [(Dockerfile)](https://github.com/sendgrid/sendgrid-python/blob/master/docker/Dockerfile)
+ - `v6.0.5`
  - `v6.0.3`
  - `v6.0.0`
  - `v5.6.0`
diff --git a/requirements.txt b/requirements.txt
index 6ec05dd..ce29b7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Flask==1.0.2
 PyYAML>=4.2b1
-python-http-client==3.1.0
+python-http-client>=3.2.1
 six==1.11.0
 pytest==3.8.2
diff --git a/sendgrid/helpers/mail/ganalytics.py b/sendgrid/helpers/mail/ganalytics.py
index f1e88f4..5f63271 100644
--- a/sendgrid/helpers/mail/ganalytics.py
+++ b/sendgrid/helpers/mail/ganalytics.py
@@ -168,7 +168,7 @@ class Ganalytics(object):
         for key in keys:
             value = getattr(self, key, None)
             if value is not None:
-                if isinstance(value, bool):
+                if isinstance(value, bool) or isinstance(value, str):
                     ganalytics[key] = value
                 else:
                     ganalytics[key] = value.get()
diff --git a/sendgrid/helpers/mail/substitution.py b/sendgrid/helpers/mail/substitution.py
index d0e5983..d515e88 100644
--- a/sendgrid/helpers/mail/substitution.py
+++ b/sendgrid/helpers/mail/substitution.py
@@ -48,7 +48,7 @@ class Substitution(object):
 
         :rtype value: string
         """
-        return self._value
+        return str(self._value) if isinstance(self._value, int) else self._value
 
     @value.setter
     def value(self, value):
diff --git a/sendgrid/version.py b/sendgrid/version.py
index e6b8055..cf37bf5 100644
--- a/sendgrid/version.py
+++ b/sendgrid/version.py
@@ -1,2 +1,1 @@
-version_info = (6, 0, 5)
-__version__ = '.'.join(str(v) for v in version_info)
+__version__ = '6.1.1'
diff --git a/setup.py b/setup.py
index 77439ca..a2b5709 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open('sendgrid/version.py') as f:
     exec(f.read())
 
 def getRequires():
-    deps = ['python_http_client>=3.0']
+    deps = ['python_http_client>=3.2.1']
     return deps
 
 
@@ -28,7 +28,7 @@ setup(
     description='Twilio SendGrid library for Python',
     long_description=readme,
     install_requires=getRequires(),
-    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
     classifiers=[
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
diff --git a/use_cases/attachment.md b/use_cases/attachment.md
index f71fed3..8ec7565 100644
--- a/use_cases/attachment.md
+++ b/use_cases/attachment.md
@@ -3,22 +3,10 @@
 ```python
 import base64
 import os
-import json
-from sendgrid import SendGridAPIClient
 from sendgrid.helpers.mail import (
     Mail, Attachment, FileContent, FileName,
     FileType, Disposition, ContentId)
-try:
-    # Python 3
-    import urllib.request as urllib
-except ImportError:
-    # Python 2
-    import urllib2 as urllib
-
-import os
-import json
 from sendgrid import SendGridAPIClient
-from sendgrid.helpers.mail import Mail
 
 message = Mail(
     from_email='from_email@example.com',
@@ -46,4 +34,4 @@ try:
 except Exception as e:
     print(e.message)
 
-```
\ No newline at end of file
+```


Test patch:
diff --git a/test/requirements.txt b/test/requirements.txt
new file mode 100644
index 0000000..6cb2e96
--- /dev/null
+++ b/test/requirements.txt
@@ -0,0 +1,6 @@
+pyyaml
+flask
+six
+coverage
+codecov
+mock
diff --git a/test/test_project.py b/test/test_project.py
index 680898f..27d0bef 100644
--- a/test/test_project.py
+++ b/test/test_project.py
@@ -40,17 +40,17 @@ class ProjectTests(unittest.TestCase):
     def test_contributing(self):
         self.assertTrue(os.path.isfile('./CONTRIBUTING.md'))
 
-    # ./.github/ISSUE_TEMPLATE
+    # ./ISSUE_TEMPLATE.md
     def test_issue_template(self):
-        self.assertTrue(os.path.isfile('./.github/ISSUE_TEMPLATE'))
+        self.assertTrue(os.path.isfile('./ISSUE_TEMPLATE.md'))
 
     # ./LICENSE.md
     def test_license(self):
-        self.assertTrue(os.path.isfile('./LICENSE.txt'))
+        self.assertTrue(os.path.isfile('./LICENSE.md'))
 
-    # ./.github/PULL_REQUEST_TEMPLATE
+    # ./PULL_REQUEST_TEMPLATE.md
     def test_pr_template(self):
-        self.assertTrue(os.path.isfile('./.github/PULL_REQUEST_TEMPLATE'))
+        self.assertTrue(os.path.isfile('./PULL_REQUEST_TEMPLATE.md'))
 
     # ./README.rst
     def test_readme(self):
diff --git a/test/test_sendgrid.py b/test/test_sendgrid.py
index 88c321c..29f4092 100644
--- a/test/test_sendgrid.py
+++ b/test/test_sendgrid.py
@@ -863,7 +863,7 @@ class UnitTests(unittest.TestCase):
         data = response.body
         unused = unassigned(data)
         self.assertEqual(type(unused), list)
-        self.assertEqual(response.status_code, 200)    
+        self.assertEqual(response.status_code, 200)
 
     def test_ips_assigned_get(self):
         headers = {'X-Mock': 200}
@@ -2304,11 +2304,15 @@ class UnitTests(unittest.TestCase):
         self.assertEqual(response.status_code, 200)
 
     def test_license_year(self):
-        LICENSE_FILE = 'LICENSE.txt'
+        LICENSE_FILE = 'LICENSE.md'
+        copyright_line=''
         with open(LICENSE_FILE, 'r') as f:
-            copyright_line = f.readline().rstrip()
+            for line in f:
+                if line.startswith('Copyright'):
+                    copyright_line = line.strip()
+                    break
         self.assertEqual(
-            'Copyright (c) 2012-%s Twilio SendGrid, Inc.' % datetime.datetime.now().year,
+            'Copyright (C) %s, Twilio SendGrid, Inc. <help@twilio.com>' % datetime.datetime.now().year,
             copyright_line)
 
     # @classmethod