v0.2.5 few fixes. Closes #24. Fixes #26