diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 59c252e..6933c8b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,24 @@
 Changelog
 ---------
 
+1.0 (2016-09-26)
+++++++++++++++++
+
+* Added inheritance of Object type settings (e.g. constructors, allow_extra_fields, etc.)
+* Added support for ordering Object type attributes
+* Updated Optional to support generating load_default/dump_default values instead of
+  using fixed values. E.g. you can have your "id" field to default to auto-generated UUID.
+* Added type registry with delayed type resolving. This allows having types that
+  reference each other (e.g. Person being author to multiple Books and Book having
+  author)
+* Updated Object only/exclude to not affect own fields
+* Added Transform modifier type
+* Added validated_type() function to simplify creation of new types that are actually
+  just existing type with an extra validator(s).
+* Fixed Object.load_into processing of None values
+* Fixed Object.load_into not annotating errors with field names
+* Fixed typos in Tuple type, added tests
+
 0.3 (2016-08-23)
 ++++++++++++++++
 
diff --git a/docs/conf.py b/docs/conf.py
index 34143bf..185cddd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.3'
+version = u'1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'0.3'
+release = u'1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/lollipop/__init__.py b/lollipop/__init__.py
index af4e698..34d6771 100644
--- a/lollipop/__init__.py
+++ b/lollipop/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.3'
+__version__ = '1.0'
 __author__ = 'Maxim Kulkin'
diff --git a/setup.py b/setup.py
index 958387d..372ea66 100644
--- a/setup.py
+++ b/setup.py
@@ -40,9 +40,10 @@ def read(fname):
     license='MIT',
     zip_safe=False,
     keywords=('serialization', 'rest', 'json', 'api', 'marshal',
-        'marshalling', 'deserialization', 'validation', 'schema'),
+              'marshalling', 'deserialization', 'validation', 'schema',
+              'marshmallow'),
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2',