Dev

merging recent work on the `dev` branch with `master`