Added note on #115
Merge branch 'v2.0' into v2.1