Add issue in TODO
Merge branch 'release/v1.0.1'