Rebuilt for 0.25
Merge branch 'version_1'