parser changes
Merge branch 'howard' of github.com:albertcui/YASP into howard