Few tweaks - v0.3.0