Upgraded version to 0.2.5 (final)