updated todo
CHANGELOG:
* fixed #19;
* fixed #21;