Makefile: tab fix
off-by-one error in wait for children completion loop
Merge branch 'master' of github.com:jovanbulck/jo-shell
intermediate merge with master