Improving modules
Merge branch 'master' of https://github.com/liveify/shell
Merge