Map isn't directly responsible anymore for shutdown
Merge branch 'master' of https://github.com/Nieo/teedee