cleaning up
Merge branch 'master' of github.com:jovanbulck/jo-shell