Updating version number, changelog, readme, etc.
Merging changes from _s