refactored #434 and updated the changelog