Bug fix
Prepared to release 0.0.22.