V1.1

I think this branch is ready to be merged with `master`. Can someone else take a look and let me know what they think?