Fixes #45 + Update README.md and Changelog