Issue 34 fix + v2.0.1 release preparation.