Release 2.1.0

This bundles previously suggested where three would affect one another pull requests into one big bundle and further elaborated on this.

The related pull requests are #57, #52 , #59 and #60.

I thinks this should be all changes that should make it into a release 2.1.0.