Tidying up @todo
Bumping to version 0.2.1