Update to changelog and version
Merge pull request #273 from SimpleRain/master

Version and Changelog