added some @TODO for 0.6 release
Merge pull request #36 from yupe/master

UPD: merge with yupe/master