Preparing 2.0.1 (fix exception)
Merge branch 'release/2.0.1'