This is a new PR for 1.2

This is a PR. It's for #39