Merge pull request #172 from vogel/fix-171

Fix 171
Merge pull request #168 from vogel/changelog-fix

Changelog fix