update to master, fix deprecations
alias WIP