3rd commit. added CHANGELOG. Bugfixes