Fixed a bug with closing requests
Merge branch 'master' into afro