PEP-8
Merge
Writing the changelog
Upping the version number