Added changlog
Merge branch 'issue_249' into issue_251
Added changelog