parser update
build
clean
Merge branch 'master' into stable-keys
in prep for #81