v0.2 - some improvements