diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68462fac92..93e22b1253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,21 @@
 - Test Ref resources to IAM Roles have good assume role documents.  Example: Lambda Function Ref refers to an IAM Role that can be assume by Lambda.
 - More Warnings around hard coded values (Regions, AccountIds) to help with the practice of reusability
 
+### 0.2.1
+###### Features
+- Added AllowedValues for Cidr parameter checking Rule W2509
+- Add Rule E2004 to check Allowed values for Cidr parameters are a valid Cidr range
+- Disable mapping Name checks W7001 if dynamic mapping names are used (Ref, FindInMap)
+- New Rule E1026 to make sure Ref's in 'Conditions' are to parameters and not resources
+- Updated CloudFormation specs to June 5th, 2018
+###### Fixes
+- Fixed an issue with Rule E1019 not giving errors when there was a bad pseudo parameter
+- Fixed an issue where conditions with Refs were validated as strings instead of Refs
+- Fix crash errors when an empty yaml file is provided
+- Updated condition functions to return the full object (Ref isn't translated while looking for AWS::NoValue)
+- Support Map Type properties when doing PrimitiveType check E3012
+- Fix an issue when boolean values not being checked when using check_value
+
 ### 0.2.0
 ###### Features
 - Standard cfn-lint Errors (E0000) for null, duplicate, and parse errors
diff --git a/setup.py b/setup.py
index d798b37e1b..950ee1980b 100644
--- a/setup.py
+++ b/setup.py
@@ -25,19 +25,16 @@
 sys.path.insert(0, os.path.abspath('src'))
 exec(open('src/cfnlint/version.py').read())
 
-
-try:
-    import pypandoc
-    long_description = pypandoc.convert('README.md', 'rst')
-except (IOError, ImportError):
-    long_description = ''
+with open('README.md') as f:
+    readme = f.read()
 
 setup(
     name='cfn-lint',
     version=__version__,
     description=('checks cloudformation for practices and behaviour \
         that could potentially be improved'),
-    long_description=long_description,
+    long_description=readme,
+    long_description_content_type="text/markdown",
     keywords='aws, lint',
     author='kddejong',
     author_email='kddejong@amazon.com',
diff --git a/src/cfnlint/version.py b/src/cfnlint/version.py
index a235eda32a..330caebd21 100644
--- a/src/cfnlint/version.py
+++ b/src/cfnlint/version.py
@@ -15,4 +15,4 @@
   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'