Added ampersand error support
Merge branch 'master' of github.com:nvanbenschoten/3600sh
Merge and format