Merge pull request wework#59 from wework/shutdown_fix Shutdown fix
Merge pull request wework#27 from wework/cleaner-code Cleaner code