Added changlog
Merge branch 'issue_249' into issue_251
Added changelog
Merge branch 'issue_251' into issue_253
Added changelog and credits