Bugfix & improvements
Updated changelog
Updated readme