update master

is there a reason the `dev` branch is behind master?