Made foolproof against bad input
Merge branch 'master' of github.com:jfjhh/bash
resolved conflicts back to linux setup