Merge branch 'development'
Added prisoner exchange function