Merge pull request #1 from flerda/v2.0.1-dev

Update 2.0.1 branch from flerda
Merge pull request #3 from flerda/v2.0.1-dev

Catch up merge from flerda into 2.0.1
Merge pull request #6 from flerda/v2.0.1-dev

Catch up merge from flerda into 2.0.1
Bumped version to 2.0.1beta13