Version 2.0.1

I guess PR #1 is not even needed - this one contains both commits.

Tags will have to be added to these commits after merge