redo to close #187 and to close #188#195

vsoch merged 2 commits intomastersingularityhub/singularity-cli:masterfrom

redo/parser-bug-fixessingularityhub/singularity-cli:redo/parser-bug-fixesCopy head branch name to clipboard