Fix error with closing the channel twice
Merge branch 'master' of https://github.com/GU-2013-TEAM-M/eos